stubbfel/121Nat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

switch submodule to libtins to fork stubbfel/libtins

Browse Source
This commit is contained in:
stubbfel
2016-03-16 00:53:37 +01:00
parent ecb3bf23ee
commit 99206b4e22
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -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

28
CMakeLists.txt
View File

@@ -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)

2
lib/src/libtins

Submodule lib/src/libtins updated: b7e20f550e...9d2ddb26b5