From 1b5ab0ddb9fced5ce09f131f99ad31a2f7eb4336 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Thu, 26 Jul 2018 12:02:08 -0700 Subject: [PATCH] Updated CMakeLists.txt --- CMakeLists.txt | 164 ++++++++++++++++++++++++------------------------- 1 file changed, 79 insertions(+), 85 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cda48e8..cbdd35d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,64 +28,90 @@ cmake_minimum_required (VERSION 3.0) project (libzt) # --- SETUP + set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_SUPPRESS_REGENERATION true) +set(PROJ_DIR ${PROJECT_SOURCE_DIR}) +set(CMAKE_BINARY_DIR ${PROJECT_SOURCE_DIR}/bin) +set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) +set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) -# Paths -set (PROJ_DIR ${PROJECT_SOURCE_DIR}) -set (CMAKE_BINARY_DIR ${PROJECT_SOURCE_DIR}/bin) -set (EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) -set (LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) +# --- BUILD CONFIG -if (WIN32) +# Default build type: Release +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +endif() + +set(SILENCE "-Wno-unused-parameter -Wno-unused-variable -Wno-missing-field-initializers") + +# Release - Optimization and no debug info +# Debug - No optimization, debug info +# RelWithDebInfo - Release optimizations and debug info +# MinSizeRel - Similar to Release but with optimizations to minimize size + +set(LIBZT_FLAGS "-DZT_SDK=1") +set(LIBZT_FLAGS_DEBUG "-DZT_SDK=1 -DLIBZT_TRACE=1 -DLWIP_DEBUG=1 -DLIBZT_DEBUG=1 -DNS_TRACE=1 -DNS_DEBUG=1") + +if(WIN32) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc -DNOMINMAX") +else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fstack-protector") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBZT_FLAGS} -O3 -Wall -Wextra -std=c++11") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${LIBZT_FLAGS_DEBUG} ${SILENCE} -std=c++11 -DLWIP_DEBUG=1") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${LIBZT_FLAGS} -O3 -std=c++11") + set(LWIP_PORT_DIR ${PROJ_DIR}/ext/lwip-contrib/ports/unix/port) +endif() + +# --- PLATFORM-SPECIFIC CONFIG + +# ANDROID-specific +if(${CMAKE_SYSTEM_NAME} MATCHES "Android") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -DSOCKLEN_T_DEFINED=1") + include_directories (/Users/joseph/Library/Android/sdk/ndk-bundle/sysroot/usr/include/arm-linux-androideabi) +endif() + +# WINDOWS-specific MSVC flags and libraries +if(WIN32) # get literal paths for Windows libraries - set (WIN_LIB_HINT_PATH "C:\\Program Files (x86)\\Windows Kits\\10\\Lib\\10.0.16299.0\\um\\x86") + set(WIN_LIB_HINT_PATH "C:\\Program Files (x86)\\Windows Kits\\10\\Lib\\10.0.16299.0\\um\\x86") message (STATUS ${WIN_LIB_HINT_PATH}) find_library(ws2_32_LIBRARY_PATH NAMES WS2_32 HINTS ${WIN_LIB_HINT_PATH}) find_library(lshlwapi_LIBRARY_PATH NAMES ShLwApi HINTS ${WIN_LIB_HINT_PATH}) #find_library(liphlpapi_LIBRARY_PATH NAMES iphlpapi.lib HINTS ${WIN_LIB_HINT_PATH}) - set (liphlpapi_LIBRARY_PATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.16299.0/um/x86/iphlpapi.Lib") + set(liphlpapi_LIBRARY_PATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.16299.0/um/x86/iphlpapi.Lib") message (STATUS ${ws2_32_LIBRARY_PATH}) message (STATUS ${lshlwapi_LIBRARY_PATH}) message (STATUS ${liphlpapi_LIBRARY_PATH}) add_definitions(-DSDK=1) add_definitions(-DZT_SDK=1) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc -DNOMINMAX") - set (LWIP_PORT_DIR ${PROJ_DIR}/ext/lwip-contrib/ports/win32) - set (COMMON_DEBUG_FLAGS "-DLIBZT_TRACE=1 -DLIBZT_DEBUG=1 -DNS_TRACE=1 -DNS_DEBUG=1") + set(LWIP_PORT_DIR ${PROJ_DIR}/ext/lwip-contrib/ports/win32) +endif() + +# --- JNI + +if(JNI EQUAL 1 OR ${CMAKE_SYSTEM_NAME} MATCHES "Android") +MESSAGE (STATUS "Looking for JNI headers") +find_package (JNI) +if(JNI_FOUND) + message (STATUS "JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}") + message (STATUS "JNI_LIBRARIES=${JNI_LIBRARIES}") + list (GET JNI_INCLUDE_DIRS 0 JNI_INCLUDE_DIR) + message (STATUS "jni path=${JNI_INCLUDE_DIR}") + include_directories ("${JNI_INCLUDE_DIR}") else() - set (CMAKE_C_FLAGS "-fstack-protector -DLWIP_DEBUG=1 -DZT_SDK=1") - set (LWIP_PORT_DIR ${PROJ_DIR}/ext/lwip-contrib/ports/unix/port) - set (COMMON_DEBUG_FLAGS "-g -DLIBZT_TRACE=1 -DLWIP_DEBUG=1 -DLIBZT_DEBUG=1 -DNS_TRACE=1 -DNS_DEBUG=1") + message (STATUS "JNI not found") +endif() +add_definitions(-DSDK_JNI=1) endif() -if (${CMAKE_SYSTEM_NAME} MATCHES "Android") - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -DSOCKLEN_T_DEFINED=1") - include_directories (/Users/joseph/Library/Android/sdk/ndk-bundle/sysroot/usr/include/arm-linux-androideabi) -endif() - -# Flags for various build types -set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -std=c++11") -# C -set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${CMAKE_C_FLAGS} ${COMMON_DEBUG_FLAGS}") -set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} ${CMAKE_C_FLAGS}") -set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${CMAKE_C_FLAGS}") -set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_FLAGS}") -# C++ -set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CMAKE_CXX_FLAGS} ${COMMON_DEBUG_FLAGS}") -set (CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${CMAKE_CXX_FLAGS}") -set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS}") -set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS}") -# Linker -#set (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS}) -#set (CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}) -#set (CMAKE_STATIC_LINKER_FLAGS ${CMAKE_STATIC_LINKER_FLAGS} --whole-archive) - -# --- LIBRARY TARGETS +# --- BUILD TARGETS # lwip -# lwIP Userspace Networking Stack -set (LWIP_SRC_DIR ${PROJ_DIR}/ext/lwip/src) +set(LWIP_SRC_DIR ${PROJ_DIR}/ext/lwip/src) include_directories (${LWIP_SRC_DIR}/include) include_directories (${LWIP_PORT_DIR}/include) file (GLOB lwip_src_glob @@ -100,8 +126,7 @@ add_library (lwip_pic STATIC ${lwip_src_glob}) set_target_properties (lwip_pic PROPERTIES POSITION_INDEPENDENT_CODE ON) # zto -# ZeroTier Core Service -set (ZTO_SRC_DIR ${PROJ_DIR}/ext/ZeroTierOne) +set(ZTO_SRC_DIR ${PROJ_DIR}/ext/ZeroTierOne) include_directories (${ZTO_SRC_DIR}/include) include_directories (${ZTO_SRC_DIR}/osdep) include_directories (${ZTO_SRC_DIR}/node) @@ -115,7 +140,7 @@ file (GLOB zto_src_glob add_library (zto STATIC ${zto_src_glob}) target_link_libraries (zto http) target_link_libraries (zto zt) -if (WIN32) +if(WIN32) target_link_libraries (zto ws2_32) target_link_libraries (zto ${lshlwapi_LIBRARY_PATH}) target_link_libraries (zto ${liphlpapi_LIBRARY_PATH}) @@ -124,40 +149,39 @@ add_library (zto_pic STATIC ${zto_src_glob}) target_link_libraries (zto_pic http_pic zt) set_target_properties (zto_pic PROPERTIES POSITION_INDEPENDENT_CODE ON) - # http # HTTP Control Plane for ZT Service add_library (http STATIC "${ZTO_SRC_DIR}/ext/http-parser/http_parser.c") add_library (http_pic STATIC "${ZTO_SRC_DIR}/ext/http-parser/http_parser.c") set_target_properties (http_pic PROPERTIES POSITION_INDEPENDENT_CODE ON) - -# libzt -# Static Library variant of ZeroTier paired with userspace stack and virtual tap interface -set (LIBZT_SRC_DIR ${PROJ_DIR}/src) +# libzt (static) +set(LIBZT_SRC_DIR ${PROJ_DIR}/src) include_directories ("${LIBZT_SRC_DIR}") include_directories ("${PROJ_DIR}/include") file (GLOB libzt_src_glob ${LIBZT_SRC_DIR}/*.cpp) add_library (zt ${libzt_src_glob}) -if (WIN32) +if(WIN32) target_link_libraries (zto ws2_32) target_link_libraries (zto ${lshlwapi_LIBRARY_PATH}) target_link_libraries (zto ${liphlpapi_LIBRARY_PATH}) endif() set_target_properties (zt PROPERTIES OUTPUT_NAME zt) -# (libzt) Shared Library variant of ZeroTier paired with userspace stack and virtual tap interface +target_link_libraries (zt zto lwip) + +# libzt (shared) add_library (ztshared SHARED ${libzt_src_glob}) target_link_libraries (ztshared zto_pic lwip_pic) set_target_properties (ztshared PROPERTIES OUTPUT_NAME zt) -if (${CMAKE_SYSTEM_NAME} MATCHES "Android") +if(${CMAKE_SYSTEM_NAME} MATCHES "Android") target_link_libraries (zt lwip zto android log) else() target_link_libraries (zt pthread lwip zto) endif() -# --- Test applications, examples, etc --- +# --- TEST APPLICATIONS AND EXAMPLES -if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android") +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android") file (GLOB APP_SOURCES ${PROJ_DIR}/examples/cpp/ipv4simple/*.cpp ${PROJ_DIR}/examples/cpp/ipv6simple/*.cpp @@ -169,17 +193,17 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android") string (REPLACE ".cpp" "" testname ${testsourcefile}) get_filename_component (testname ${testname} NAME) add_executable (${testname} ${testsourcefile}) - if (WIN32) + if(WIN32) target_link_libraries (${testname} lwip zto zt) else() - target_link_libraries (${testname} lwip zto zt pthread dl) + target_link_libraries (${testname} zt pthread dl) endif() endforeach (testsourcefile ${APP_SOURCES}) # selftest add_executable (selftest ${PROJ_DIR}/test/selftest.cpp) target_compile_options (selftest PRIVATE -D__SELFTEST__) - if (WIN32) + if(WIN32) target_link_libraries (selftest lwip zto zt ${ws2_32_LIBRARY_PATH} ${lshlwapi_LIBRARY_PATH} ${liphlpapi_LIBRARY_PATH}) else() target_link_libraries (selftest pthread lwip zto zt) @@ -190,33 +214,3 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android") target_compile_options (nativetest PRIVATE -D__NATIVETEST__) target_link_libraries (nativetest lwip zto zt) endif() - -# Clean up intermediate library targets -#file (REMOVE ${LIBRARY_OUTPUT_PATH}/libhttp.a) -#file (REMOVE ${LIBRARY_OUTPUT_PATH}/libhttp_pic.a) -#file (REMOVE ${LIBRARY_OUTPUT_PATH}/libzto.a) -#file (REMOVE ${LIBRARY_OUTPUT_PATH}/libzto_pic.a) -#file (REMOVE ${LIBRARY_OUTPUT_PATH}/liblwip.a) -#file (REMOVE ${LIBRARY_OUTPUT_PATH}/liblwip_pic.a) - - -# --- INSTALL - -#install (TARGETS zt DESTINATION lib) - -# --- CONFIGURATION - -if (JNI EQUAL 1 OR ${CMAKE_SYSTEM_NAME} MATCHES "Android") -MESSAGE (STATUS "Looking for JNI headers") -find_package (JNI) -if (JNI_FOUND) - message (STATUS "JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}") - message (STATUS "JNI_LIBRARIES=${JNI_LIBRARIES}") - list (GET JNI_INCLUDE_DIRS 0 JNI_INCLUDE_DIR) - message (STATUS "jni path=${JNI_INCLUDE_DIR}") - include_directories ("${JNI_INCLUDE_DIR}") -else() - message (STATUS "JNI not found") -endif() -add_definitions(-DSDK_JNI=1) -endif() \ No newline at end of file