From e6a4ddbe35ec705ef3c674f41b466c6a73a7dc57 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Wed, 16 Mar 2016 01:17:13 +0100 Subject: [PATCH] refactor package process --- Makefile | 13 ++- files/121nat/CMakeLists.txt | 29 ++++-- files/121nat/src/CMakeLists.txt | 11 --- files/jsoncpp/CMakeLists.txt | 146 ------------------------------ files/libtins/CMakeLists.txt | 150 ++++++++++++++++++++++--------- files/libtins/src/CMakeLists.txt | 80 ----------------- 6 files changed, 139 insertions(+), 290 deletions(-) delete mode 100644 files/121nat/src/CMakeLists.txt delete mode 100644 files/jsoncpp/CMakeLists.txt delete mode 100644 files/libtins/src/CMakeLists.txt diff --git a/Makefile b/Makefile index 9aa0898..1fc788b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=121nat -PKG_VERSION:=0.5.0 +PKG_VERSION:=0.6.5 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/stubbfel/121nat.git @@ -28,10 +28,7 @@ endef define Build/Configure mkdir -p $(PKG_BUILD_DIR)/build/121Nat - $(CP) ./files/jsoncpp/CMakeLists.txt $(PKG_BUILD_DIR)/lib/src/jsoncpp/ $(CP) ./files/libtins/CMakeLists.txt $(PKG_BUILD_DIR)/lib/src/libtins/ - $(CP) ./files/libtins/src/CMakeLists.txt $(PKG_BUILD_DIR)/lib/src/libtins/src/ - $(CP) ./files/121nat/src/CMakeLists.txt $(PKG_BUILD_DIR)/src/ $(CP) ./files/121nat/CMakeLists.txt $(PKG_BUILD_DIR)/ IN_OPENWRT=1 \ @@ -49,7 +46,7 @@ define Build/Configure TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \ TARGET_CFLAGS="$(TARGET_CFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ - cmake -H$(PKG_BUILD_DIR)/ -B$(PKG_BUILD_DIR)/build/121Nat + cmake -H$(PKG_BUILD_DIR)/ -B$(PKG_BUILD_DIR)/build/121Nat/ endef define Build/Compile @@ -57,9 +54,9 @@ define Build/Compile endef define Package/121nat/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/build/121Nat/lib/src/libtins/lib/libtins.so.3.3 $(1)/usr/lib/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/build/121Nat/lib/src/jsoncpp/src/lib_json/libjsoncpp.a $(1)/usr/lib/ + #$(INSTALL_DIR) $(1)/usr/lib/ + #$(INSTALL_BIN) $(PKG_BUILD_DIR)/build/121Nat/lib/src/libtins/lib/libtins.a $(1)/usr/lib/ + #$(INSTALL_BIN) $(PKG_BUILD_DIR)/build/121Nat/lib/src/jsoncpp/src/lib_json/libjsoncpp.a $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/build/121Nat/src/121Nat $(1)/usr/bin $(INSTALL_DIR) $(1)/etc/121nat diff --git a/files/121nat/CMakeLists.txt b/files/121nat/CMakeLists.txt index 235ef15..100fb20 100644 --- a/files/121nat/CMakeLists.txt +++ b/files/121nat/CMakeLists.txt @@ -1,8 +1,27 @@ cmake_minimum_required(VERSION 3.3.2) project (121Nat) -link_directories("$ENV{STAGING_DIR}/usr/lib") -ADD_SUBDIRECTORY(lib/src/jsoncpp) -ADD_SUBDIRECTORY(lib/src/libtins) +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 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 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 $ENV{STAGING_DIR}/usr/ CACHE PATH "test14") +#SET(PCAP_LIBRARY $ENV{STAGING_DIR}/usr/lib/libpcap.a 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/files/121nat/src/CMakeLists.txt b/files/121nat/src/CMakeLists.txt deleted file mode 100644 index 120cace..0000000 --- a/files/121nat/src/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -file(GLOB_RECURSE 121Nat_Src_Files "*.h" "*.cpp") -INCLUDE_DIRECTORIES(../lib/src/libtins/include) -INCLUDE_DIRECTORIES(../lib/src/jsoncpp/include) -add_executable(121Nat ${121Nat_Src_Files}) -target_link_libraries (121Nat pthread tins jsoncpp_lib_static "$ENV{TARGET_LDFLAGS}" ) -set_property(TARGET 121Nat PROPERTY CXX_STANDARD 11) -set_property(TARGET 121Nat PROPERTY CXX_STANDARD_REQUIRED ON) -install(TARGETS 121Nat - RUNTIME DESTINATION bin -) - diff --git a/files/jsoncpp/CMakeLists.txt b/files/jsoncpp/CMakeLists.txt deleted file mode 100644 index 181519e..0000000 --- a/files/jsoncpp/CMakeLists.txt +++ /dev/null @@ -1,146 +0,0 @@ -# vim: et ts=4 sts=4 sw=4 tw=0 - -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5) -PROJECT(jsoncpp) -#ENABLE_TESTING() - -OPTION(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" OFF) -OPTION(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" OFF) -OPTION(JSONCPP_WITH_WARNING_AS_ERROR "Force compilation to fail if a warning occurs" OFF) -OPTION(JSONCPP_WITH_STRICT_ISO "Issue all the warnings demanded by strict ISO C and ISO C++" ON) -OPTION(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON) -OPTION(JSONCPP_WITH_CMAKE_PACKAGE "Generate and install cmake package files" OFF) -OPTION(BUILD_SHARED_LIBS "Build jsoncpp_lib as a shared library." Off) -OPTION(BUILD_STATIC_LIBS "Build jsoncpp_lib static library." On) - -# Ensures that CMAKE_BUILD_TYPE is visible in cmake-gui on Unix -IF(NOT WIN32) - IF(NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE Release CACHE STRING - "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel Coverage." - FORCE) - ENDIF() -ENDIF() - -SET(DEBUG_LIBNAME_SUFFIX "" CACHE STRING "Optional suffix to append to the library name for a debug build") -SET(LIB_SUFFIX "" CACHE STRING "Optional arch-dependent suffix for the library installation directory") - -SET(RUNTIME_INSTALL_DIR bin - CACHE PATH "Install dir for executables and dlls") -SET(ARCHIVE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} - CACHE PATH "Install dir for static libraries") -SET(LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} - CACHE PATH "Install dir for shared libraries") -SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include - CACHE PATH "Install dir for headers") -SET(PACKAGE_INSTALL_DIR lib${LIB_SUFFIX}/cmake - CACHE PATH "Install dir for cmake package config files") -MARK_AS_ADVANCED( RUNTIME_INSTALL_DIR ARCHIVE_INSTALL_DIR INCLUDE_INSTALL_DIR PACKAGE_INSTALL_DIR ) - -# Set variable named ${VAR_NAME} to value ${VALUE} -FUNCTION(set_using_dynamic_name VAR_NAME VALUE) - SET( "${VAR_NAME}" "${VALUE}" PARENT_SCOPE) -ENDFUNCTION() - -# Extract major, minor, patch from version text -# Parse a version string "X.Y.Z" and outputs -# version parts in ${OUPUT_PREFIX}_MAJOR, _MINOR, _PATCH. -# If parse succeeds then ${OUPUT_PREFIX}_FOUND is TRUE. -MACRO(jsoncpp_parse_version VERSION_TEXT OUPUT_PREFIX) - SET(VERSION_REGEX "[0-9]+\\.[0-9]+\\.[0-9]+(-[a-zA-Z0-9_]+)?") - IF( ${VERSION_TEXT} MATCHES ${VERSION_REGEX} ) - STRING(REGEX MATCHALL "[0-9]+|-([A-Za-z0-9_]+)" VERSION_PARTS ${VERSION_TEXT}) - LIST(GET VERSION_PARTS 0 ${OUPUT_PREFIX}_MAJOR) - LIST(GET VERSION_PARTS 1 ${OUPUT_PREFIX}_MINOR) - LIST(GET VERSION_PARTS 2 ${OUPUT_PREFIX}_PATCH) - set_using_dynamic_name( "${OUPUT_PREFIX}_FOUND" TRUE ) - ELSE( ${VERSION_TEXT} MATCHES ${VERSION_REGEX} ) - set_using_dynamic_name( "${OUPUT_PREFIX}_FOUND" FALSE ) - ENDIF() -ENDMACRO() - -# Read out version from "version" file -#FILE(STRINGS "version" JSONCPP_VERSION) -#SET( JSONCPP_VERSION_MAJOR X ) -#SET( JSONCPP_VERSION_MINOR Y ) -#SET( JSONCPP_VERSION_PATCH Z ) -SET( JSONCPP_VERSION 1.6.5 ) -jsoncpp_parse_version( ${JSONCPP_VERSION} JSONCPP_VERSION ) -#IF(NOT JSONCPP_VERSION_FOUND) -# MESSAGE(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z") -#ENDIF(NOT JSONCPP_VERSION_FOUND) - -MESSAGE(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}") -# File version.h is only regenerated on CMake configure step -CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/src/lib_json/version.h.in" - "${PROJECT_SOURCE_DIR}/include/json/version.h" - NEWLINE_STYLE UNIX ) -CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/version.in" - "${PROJECT_SOURCE_DIR}/version" - NEWLINE_STYLE UNIX ) - -macro(UseCompilationWarningAsError) - if ( MSVC ) - # Only enabled in debug because some old versions of VS STL generate - # warnings when compiled in release configuration. - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /WX ") - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") - if (JSONCPP_WITH_STRICT_ISO) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors") - endif () - endif() -endmacro() - -# Include our configuration header -INCLUDE_DIRECTORIES( ${jsoncpp_SOURCE_DIR}/include ) - -if ( MSVC ) - # Only enabled in debug because some old versions of VS STL generate - # unreachable code warning when compiled in release configuration. - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4 ") -endif() - -if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # using regular Clang or AppleClang - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Wno-sign-conversion") -elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - # using GCC - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Wextra") - # not yet ready for -Wsign-conversion - - if (JSONCPP_WITH_STRICT_ISO AND NOT JSONCPP_WITH_WARNING_AS_ERROR) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") - endif () -endif() - -find_program(CCACHE_FOUND ccache) -if(CCACHE_FOUND) - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) - set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) -endif(CCACHE_FOUND) - -IF(JSONCPP_WITH_WARNING_AS_ERROR) - UseCompilationWarningAsError() -ENDIF() - -IF(JSONCPP_WITH_PKGCONFIG_SUPPORT) - CONFIGURE_FILE( - "pkg-config/jsoncpp.pc.in" - "pkg-config/jsoncpp.pc" - @ONLY) - INSTALL(FILES "${CMAKE_BINARY_DIR}/pkg-config/jsoncpp.pc" - DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig") -ENDIF() - -IF(JSONCPP_WITH_CMAKE_PACKAGE) - INSTALL(EXPORT jsoncpp - DESTINATION ${PACKAGE_INSTALL_DIR}/jsoncpp - FILE jsoncppConfig.cmake) -ENDIF() - -# Build the different applications -ADD_SUBDIRECTORY( src ) - -#install the includes -ADD_SUBDIRECTORY( include ) diff --git a/files/libtins/CMakeLists.txt b/files/libtins/CMakeLists.txt index 02aef97..651bafa 100644 --- a/files/libtins/CMakeLists.txt +++ b/files/libtins/CMakeLists.txt @@ -1,6 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.1) PROJECT(libtins) -#INCLUDE_DIRECTORIES("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") + # Compile in release mode by default IF(NOT CMAKE_BUILD_TYPE) MESSAGE(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.") @@ -16,10 +16,14 @@ IF(MSVC) # Disable VC secure checks, since these are not really issues. ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS=1") ADD_DEFINITIONS("-D_SCL_SECURE_NO_WARNINGS=1") + ADD_DEFINITIONS("-DNOGDI=1") ELSE() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") - # Fix for Clang on OSX - ADD_DEFINITIONS("-DGTEST_HAS_TR1_TUPLE=0") +ENDIF() + +IF(APPLE) + # This is set to ON as of policy CMP0042 + SET(CMAKE_MACOSX_RPATH ON) ENDIF() # Build output checks @@ -34,6 +38,7 @@ IF(LIBTINS_BUILD_SHARED) ELSE(LIBTINS_BUILD_SHARED) MESSAGE(STATUS "Build will generate a static library.") SET(LIBTINS_TYPE STATIC) + ADD_DEFINITIONS("-DTINS_STATIC=1") ENDIF(LIBTINS_BUILD_SHARED) # The version number. @@ -42,10 +47,10 @@ SET(LIBTINS_VERSION_MINOR 3) SET(LIBTINS_VERSION "${LIBTINS_VERSION_MAJOR}.${LIBTINS_VERSION_MINOR}") # Required Packages -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/lib/src/libtins/cmake/Modules/") +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") # Look for libpcap -#FIND_PACKAGE(PCAP REQUIRED) +FIND_PACKAGE(PCAP REQUIRED) # Set some Windows specific flags IF(WIN32) @@ -56,45 +61,85 @@ IF(WIN32) ADD_DEFINITIONS(-DNOMINMAX) ENDIF(WIN32) +INCLUDE(ExternalProject) + # ******************* # Compilation options # ******************* -# C++11 support +# Always check for C++ features +#INCLUDE(CheckCXXFeatures) -#OPTION(LIBTINS_ENABLE_CXX11 "Compile libtins with c++11 features" On) -#IF(LIBTINS_ENABLE_CXX11) -# SET(HAVE_CXX11 ON) -# INCLUDE(CheckCXX11Features) -# IF(HAS_CXX11_NULLPTR AND HAS_CXX11_RVALUE_REFERENCES) -# MESSAGE(STATUS "Enabling C++11 features") -# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS}") -# ELSE(HAS_CXX11_NULLPTR AND HAS_CXX11_RVALUE_REFERENCES) -# MESSAGE(FATAL_ERROR "C++11 features requested but the compiler does not support them.") -# ENDIF(HAS_CXX11_NULLPTR AND HAS_CXX11_RVALUE_REFERENCES) -#ELSE(LIBTINS_ENABLE_CXX11) -# MESSAGE( -# WARNING -# "Disabling C++11 features. Use LIBTINS_ENABLE_CXX11=1 to enable them. " -# "Unless you are using an old compiler, you should enable this option, " -# "as it increases the library's performance") -#ENDIF(LIBTINS_ENABLE_CXX11) +IF(HAS_GCC_BUILTIN_SWAP) + SET(TINS_HAVE_GCC_BUILTIN_SWAP ON) +ENDIF() + +# C++11 support +OPTION(LIBTINS_ENABLE_CXX11 "Compile libtins with c++11 features" ON) +IF(LIBTINS_ENABLE_CXX11) + # We only use declval and decltype on gcc/clang as VC fails to build that code, + # at least on VC2013 + # IF(HAS_CXX11_RVALUE_REFERENCES AND HAS_CXX11_FUNCTIONAL AND HAS_CXX11_CHRONO AND + # ((HAS_CXX11_DECLVAL AND HAS_CXX11_DECLTYPE) OR MSVC)) + SET(TINS_HAVE_CXX11 ON) + MESSAGE(STATUS "Enabling C++11 features") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS}") +# ELSE() + # MESSAGE(WARNING "The compiler doesn't support the necessary C++11 features. " + # "Disabling C++11 on this build") + # ENDIF() +ELSE(LIBTINS_ENABLE_CXX11) + MESSAGE( + WARNING + "Disabling C++11 features. Use LIBTINS_ENABLE_CXX11=1 to enable them. " + "Unless you are using an old compiler, you should enable this option, " + "as it increases the library's performance") +ENDIF(LIBTINS_ENABLE_CXX11) # IEEE 802.11 and WPA2 decryption support -OPTION(LIBTINS_ENABLE_DOT11 "Compile libtins with IEEE 802.11 support" Off) -OPTION(LIBTINS_ENABLE_WPA2 "Compile libtins with WPA2 decryption features (requires OpenSSL)" Off) +OPTION(LIBTINS_ENABLE_DOT11 "Compile libtins with IEEE 802.11 support" ON) +OPTION(LIBTINS_ENABLE_WPA2 "Compile libtins with WPA2 decryption features (requires OpenSSL)" ON) IF(LIBTINS_ENABLE_DOT11) - SET(HAVE_DOT11 ON) + SET(TINS_HAVE_DOT11 ON) MESSAGE(STATUS "Enabling IEEE 802.11 support.") IF(LIBTINS_ENABLE_WPA2) - FIND_PACKAGE(OpenSSL REQUIRED) - SET(HAVE_WPA2_DECRYPTION ON) - MESSAGE(STATUS "Enabling WPA2 decryption support.") + FIND_PACKAGE(OpenSSL) + IF(OPENSSL_FOUND) + SET(TINS_HAVE_WPA2_DECRYPTION ON) + MESSAGE(STATUS "Enabling WPA2 decryption support.") + ELSE() + MESSAGE(WARNING "Disabling WPA2 decryption support since OpenSSL was not found") + # Default this to empty strings + SET(OPENSSL_INCLUDE_DIR "") + SET(OPENSSL_LIBRARIES "") + ENDIF() ELSE(LIBTINS_ENABLE_WPA2) MESSAGE(STATUS "Disabling WPA2 decryption support.") ENDIF(LIBTINS_ENABLE_WPA2) ENDIF(LIBTINS_ENABLE_DOT11) +OPTION(LIBTINS_ENABLE_ACK_TRACKER "Enable TCP ACK tracking support" ON) +IF(LIBTINS_ENABLE_ACK_TRACKER AND TINS_HAVE_CXX11) + FIND_PACKAGE(Boost) + IF (Boost_FOUND) + MESSAGE(STATUS "Enabling TCP ACK tracking support.") + INCLUDE_DIRECTORIES(Boost_INCLUDE_DIRS) + SET(TINS_HAVE_ACK_TRACKER ON) + ELSE() + MESSAGE(WARNING "Disabling ACK tracking support as boost.icl was not found") + SET(TINS_HAVE_ACK_TRACKER OFF) + ENDIF() +ELSE() + SET(TINS_HAVE_ACK_TRACKER OFF) + MESSAGE(STATUS "Disabling ACK tracking support") +ENDIF() + +OPTION(LIBTINS_ENABLE_WPA2_CALLBACKS "Enable WPA2 callback interface" ON) +IF(LIBTINS_ENABLE_WPA2_CALLBACKS AND TINS_HAVE_WPA2_DECRYPTION AND TINS_HAVE_CXX11) + SET(STATUS "Enabling WPA2 callback interface") + SET(TINS_HAVE_WPA2_CALLBACKS ON) +ENDIF() + # Use pcap_sendpacket to send l2 packets rather than raw sockets IF(WIN32) SET(USE_PCAP_SENDPACKET_DEFAULT ON) @@ -105,7 +150,7 @@ ENDIF(WIN32) OPTION(LIBTINS_USE_PCAP_SENDPACKET "Use pcap_sendpacket to send l2 packets" ${USE_PCAP_SENDPACKET_DEFAULT}) IF(LIBTINS_USE_PCAP_SENDPACKET) - SET(HAVE_PACKET_SENDER_PCAP_SENDPACKET ON) + SET(TINS_HAVE_PACKET_SENDER_PCAP_SENDPACKET ON) MESSAGE(STATUS "Using pcap_sendpacket to send l2 packets.") ENDIF(LIBTINS_USE_PCAP_SENDPACKET) @@ -150,24 +195,49 @@ INSTALL( DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) +# Confiugure the uninstall script +CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY +) + +# Add uninstall target +ADD_CUSTOM_TARGET(uninstall + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) + # ****************** # Add subdirectories # ****************** ADD_SUBDIRECTORY(include) -ADD_SUBDIRECTORY(src) #ADD_SUBDIRECTORY(examples) +ADD_SUBDIRECTORY(src) # Only include googletest if the git submodule has been fetched -#IF(EXISTS "${CMAKE_SOURCE_DIR}/googletest/CMakeLists.txt") +IF(EXISTS "${CMAKE_SOURCE_DIR}/googletest/CMakeLists.txt") # Enable tests and add the test directory -# MESSAGE(STATUS "Tests have been enabled") -# SET(gtest_force_shared_crt ON CACHE BOOL "Always use /MD") -# ENABLE_TESTING() -# ADD_SUBDIRECTORY(googletest) -# ADD_SUBDIRECTORY(tests) -#ELSE() -# MESSAGE(STATUS "googletest git submodule is absent. Run `git submodule init && git submodule update` to get it") -#ENDIF() + #MESSAGE(STATUS "Tests have been enabled") + #SET(GOOGLETEST_ROOT ${CMAKE_SOURCE_DIR}/googletest) + #SET(GOOGLETEST_INCLUDE ${GOOGLETEST_ROOT}/googletest/include) + #SET(GOOGLETEST_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/googletest) + #SET(GOOGLETEST_LIBRARY ${GOOGLETEST_BINARY_DIR}/googletest) + +# ExternalProject_Add( +# googletest +# DOWNLOAD_COMMAND "" +# SOURCE_DIR ${GOOGLETEST_ROOT} +# BINARY_DIR ${GOOGLETEST_BINARY_DIR} +# CMAKE_CACHE_ARGS "-DBUILD_GTEST:bool=ON" "-DBUILD_GMOCK:bool=OFF" +# "-Dgtest_force_shared_crt:bool=ON" +# INSTALL_COMMAND "" +# ) + # Make sure we build googletest before anything else + #ADD_DEPENDENCIES(tins googletest) + #ENABLE_TESTING() + #ADD_SUBDIRECTORY(tests) +ELSE() + MESSAGE(STATUS "googletest git submodule is absent. Run `git submodule init && git submodule update` to get it") +ENDIF() # ********************************** # CMake project configuration export diff --git a/files/libtins/src/CMakeLists.txt b/files/libtins/src/CMakeLists.txt deleted file mode 100644 index f97acaa..0000000 --- a/files/libtins/src/CMakeLists.txt +++ /dev/null @@ -1,80 +0,0 @@ -SET(LIBTINS_INCLUDE_DIR ../include/tins/) - -#IF(HAVE_PCAP_IMMEDIATE_MODE) - ADD_DEFINITIONS("-DHAVE_PCAP_IMMEDIATE_MODE=1") -#ENDIF() - -INCLUDE_DIRECTORIES( - ${LIBTINS_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} - "$ENV{STAGING_DIR}/usr/include" -) - -ADD_LIBRARY( - tins ${LIBTINS_TYPE} - arp.cpp - bootp.cpp - handshake_capturer.cpp - stp.cpp - pppoe.cpp - crypto.cpp - dhcp.cpp - dhcpv6.cpp - dns.cpp - dot3.cpp - dot1q.cpp - eapol.cpp - ethernetII.cpp - icmp.cpp - icmpv6.cpp - internals.cpp - ip_reassembler.cpp - ip.cpp - ip_address.cpp - ipv6.cpp - ipv6_address.cpp - ipsec.cpp - llc.cpp - loopback.cpp - network_interface.cpp - offline_packet_filter.cpp - packet_sender.cpp - packet_writer.cpp - ppi.cpp - pdu.cpp - pktap.cpp - radiotap.cpp - address_range.cpp - rawpdu.cpp - rsn_information.cpp - sll.cpp - snap.cpp - sniffer.cpp - tcp.cpp - tcp_stream.cpp - udp.cpp - utils.cpp - dot11/dot11_base.cpp - dot11/dot11_data.cpp - dot11/dot11_mgmt.cpp - dot11/dot11_beacon.cpp - dot11/dot11_assoc.cpp - dot11/dot11_auth.cpp - dot11/dot11_probe.cpp - dot11/dot11_control.cpp -) - -TARGET_LINK_LIBRARIES(tins "$ENV{STAGING_DIR}/usr/lib/libpcap.so" ${OPENSSL_LIBRARIES} ${LIBTINS_OS_LIBS} "$ENV{TARGET_LDFLAGS}") - -SET_TARGET_PROPERTIES(tins PROPERTIES OUTPUT_NAME tins ) -SET_TARGET_PROPERTIES(tins PROPERTIES VERSION ${LIBTINS_VERSION} SOVERSION ${LIBTINS_VERSION} ) -set_property(TARGET tins PROPERTY CXX_STANDARD 11) -set_property(TARGET tins PROPERTY CXX_STANDARD_REQUIRED ON) -# Install instructions for this target -INSTALL( - TARGETS tins - EXPORT libtinsTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - COMPONENT dev -)