diff options
Diffstat (limited to 'libtransport/CMakeLists.txt')
| -rw-r--r-- | libtransport/CMakeLists.txt | 87 |
1 files changed, 18 insertions, 69 deletions
diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index c431ace04..d94f2859b 100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -44,58 +44,29 @@ set(TRANSPORT_LOG_LEVEL "INFO" CACHE STRING "Set log level") set(TRANSPORT_ROOT_PATH "src") -set(TRANSPORT_CORE ${TRANSPORT_ROOT_PATH}/core) -set(TRANSPORT_TRANSPORT ${TRANSPORT_ROOT_PATH}/transport) -set(TRANSPORT_ERRORS ${TRANSPORT_ROOT_PATH}/errors) -set(TRANSPORT_UTILS ${TRANSPORT_ROOT_PATH}/utils) -set(TRANSPORT_HTTP ${TRANSPORT_ROOT_PATH}/http) -set(TRANSPORT_PORTABILITY ${TRANSPORT_ROOT_PATH}/portability) -set(TRANSPORT_INTERFACES ${TRANSPORT_ROOT_PATH}/interfaces) - -# Install includes -set(INSTALL_INCLUDE_DIR include/hicn/transport) - set(LIBTRANSPORT hicntransport) if ((BUILD_HICNPLUGIN OR BUILD_MEMIF_CONNECTOR) AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") set(__vpp__ 1) - set(LIBTRANSPORT ${LIBTRANSPORT}-memif) - find_package(Vpp REQUIRED) - - list(APPEND LIBTRANSPORT_INTERNAL_INCLUDE_DIRS - ${VPP_INCLUDE_DIRS} - ) endif () set(LIBTRANSPORT ${LIBTRANSPORT} CACHE INTERNAL "" FORCE) +if (NOT WIN32) set(LIBTRANSPORT_SHARED ${LIBTRANSPORT}.shared CACHE INTERNAL "" FORCE) +endif () set(LIBTRANSPORT_STATIC ${LIBTRANSPORT}.static CACHE INTERNAL "" FORCE) set(LIBTRANSPORT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src CACHE INTERNAL "" FORCE) include(WindowsMacros) include(IosMacros) + find_package_wrapper(Libparc REQUIRED) find_package_wrapper(Asio REQUIRED) find_package(OpenSSL REQUIRED) - -if (${OPENSSL_VERSION} VERSION_EQUAL "1.1.1a" OR ${OPENSSL_VERSION} VERSION_GREATER "1.1.1a") - set(SECURE_HICNTRANSPORT 1) -endif() - -if (__vpp__) - find_package(Libmemif REQUIRED) -endif() +find_package(Threads REQUIRED) +find_package(OpenSSL REQUIRED) +find_package(Libconfig++ REQUIRED) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) - if (__vpp__) - find_package(HicnPlugin REQUIRED) - find_package(SafeVapi REQUIRED) - - list(APPEND LIBRARIES - ${LIBMEMIF_LIBRARIES} - ${SAFE_VAPI_LIBRARIES} - ) - endif() - find_package_wrapper(Libhicn REQUIRED) else() if (DISABLE_SHARED_LIBRARIES) @@ -110,55 +81,32 @@ else() else() set(HICN_LIBRARIES ${LIBHICN_SHARED}) list(APPEND DEPENDENCIES + ${LIBHICN_SHARED} ) - - if (__vpp__) - list(APPEND DEPENDENCIES - hicn_plugin - ${SAFE_VAPI_SHARED} - ) - - list(APPEND LIBRARIES - ${LIBMEMIF_LIBRARIES} - ${SAFE_VAPI_LIBRARIES} - ) - endif() endif() endif() - -list(APPEND LIBTRANSPORT_INTERNAL_INCLUDE_DIRS - ${LIBMEMIF_INCLUDE_DIRS} - ${SAFE_VAPI_INCLUDE_DIRS} -) - -include(Packaging) - -find_package(Threads REQUIRED) - -if (${COMPILE_TESTS}) - include(TestMacros) - find_package(GTest REQUIRED) - list(APPEND LIBTRANSPORT_INTERNAL_INCLUDE_DIRS - ${GTEST_INCLUDE_DIRS} - ) -endif() - -if(${CMAKE_SYSTEM_NAME} STREQUAL "Android") - find_package(OpenSSL REQUIRED) +if (WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275 /wd4996 /wd4311 /wd4302") + if (CMAKE_BUILD_TYPE EQUAL "RELEASE") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:\"MSVCRTD\"" ) + endif () endif () +include(Packaging) list(APPEND LIBRARIES + ${HICN_LIBRARIES} ${LIBPARC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} - ${HICN_LIBRARIES} ${VPP_LIBRARIES} ${ANDROID_LIBRARIES} ${OPENSSL_LIBRARIES} ${WINDOWS_LIBRARIES} - ${LIBHICNCTRL_LIBRARIES} + ${LIBCONFIG_CPP_LIBRARIES} ) +set(LIBTRANSPORT_LIBRARIES_LIST "${LIBPARC_LIBRARIES};${CMAKE_THREAD_LIBS_INIT};${VPP_LIBRARIES};${ANDROID_LIBRARIES};${OPENSSL_LIBRARIES};${WINDOWS_LIBRARIES};${LIBCONFIG_CPP_LIBRARIES}" CACHE INTERNAL "LIBTRANSPORT_LIBRARIES_LIST") + # Include dirs -- Order does matter! list(APPEND LIBTRANSPORT_INTERNAL_INCLUDE_DIRS ${HICN_INCLUDE_DIRS} @@ -168,6 +116,7 @@ list(APPEND LIBTRANSPORT_INTERNAL_INCLUDE_DIRS ${ASIO_INCLUDE_DIRS} ${WINDOWS_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} + ${CONFIG_INCLUDE_DIRS} ) add_subdirectory(includes/hicn/transport) |