diff --git a/.gitmodules b/.gitmodules index 4e704fc..7251137 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/open-source-parsers/jsoncpp.git [submodule "lib/src/libtins"] path = lib/src/libtins - url = https://github.com/mfontanini/libtins.git + url = git@github.com:stubbfel/libtins [submodule "lib/src/easyloggingpp"] path = lib/src/easyloggingpp url = git@github.com:easylogging/easyloggingpp.git diff --git a/CMakeLists.txt b/CMakeLists.txt index bad386d..e4d5783 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,22 +4,24 @@ INCLUDE_DIRECTORIES(lib/src/jsoncpp/include) INCLUDE_DIRECTORIES(lib/src/libtins/include) INCLUDE_DIRECTORIES(lib/src/easyloggingpp/src/) ADD_SUBDIRECTORY(src) -SET(JSONCPP_WITH_TESTS OFF) -SET(JSONCPP_WITH_POST_BUILD_UNITTEST OFF) -SET(JSONCPP_WITH_PKGCONFIG_SUPPORT OFF) -SET(JSONCPP_WITH_CMAKE_PACKAGE OFF) -SET(BUILD_SHARED_LIBS OFF) -SET(BUILD_STATIC_LIBS ON) +SET(JSONCPP_WITH_TESTS OFF CACHE BOOL "test8") +SET(JSONCPP_WITH_POST_BUILD_UNITTEST OFF CACHE BOOL "tes9") +SET(JSONCPP_WITH_PKGCONFIG_SUPPORT OFF CACHE BOOL "test10") +SET(JSONCPP_WITH_CMAKE_PACKAGE OFF CACHE BOOL "test11") +SET(BUILD_SHARED_LIBS OFF CACHE BOOL "test12") +SET(BUILD_STATIC_LIBS ON CACHE BOOL "test13") ADD_SUBDIRECTORY(lib/src/jsoncpp) SET(BUILD_SHARED_LIBS ON) -SET(LIBTINS_BUILD_SHARED OFF) -SET(LIBTINS_ENABLE_CXX11 ON) -SET(LIBTINS_ENABLE_WPA2 OFF) -SET(LIBTINS_ENABLE_DOT11 OFF) -SET(HAVE_PCAP_IMMEDIATE_MODE ON) -SET(LIBTINS_ENABLE_ACK_TRACKER OFF) -SET(LIBTINS_ENABLE_WPA2_CALLBACKS OFF) +SET(LIBTINS_BUILD_SHARED OFF CACHE BOOL "test") +SET(LIBTINS_ENABLE_CXX11 ON CACHE BOOL "test2") +SET(LIBTINS_ENABLE_WPA2 OFF CACHE BOOL "test3") +SET(LIBTINS_ENABLE_DOT11 OFF CACHE BOOL "test4") +SET(HAVE_PCAP_IMMEDIATE_MODE ON CACHE BOOL "test5") +SET(LIBTINS_ENABLE_ACK_TRACKER OFF CACHE BOOL "test6") +SET(LIBTINS_ENABLE_WPA2_CALLBACKS OFF CACHE BOOL "test7") SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/lib/src/libtins/cmake/Modules) +SET(PCAP_ROOT_DIR /usr/ CACHE PATH "test14") +SET(PCAP_LIBRARY /usr/lib64/libpcap.so CACHE FILEPATH "test14") ADD_SUBDIRECTORY(lib/src/libtins) set_property(TARGET 121Nat PROPERTY CXX_STANDARD 11) set_property(TARGET 121Nat PROPERTY CXX_STANDARD_REQUIRED ON) diff --git a/lib/src/libtins b/lib/src/libtins index b7e20f5..9d2ddb2 160000 --- a/lib/src/libtins +++ b/lib/src/libtins @@ -1 +1 @@ -Subproject commit b7e20f550ec16536ac9557e561ce17a050e83bd1 +Subproject commit 9d2ddb26b57b52ff0370792a1ea566a29af01a70