From 95d1452eefadffaf1ec75dd0a8336bc2c387eb17 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 01 2月 2020 02:48:51 +0800
Subject: [PATCH] rename enums and further developments
---
CMakeLists.txt | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 405cd5c..1029c46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
SET(LICENSECC_SHORT_LICENSE "BSD Software License")
@@ -34,20 +34,30 @@
SET(CMAKE_CROSSCOMPILING_EMULATOR "wine")
ENDIF()
-
-SET ( OPENSSL_USE_STATIC_LIBS ON )
-find_package(OpenSSL COMPONENTS Crypto)
+SET (OPENSSL_USE_STATIC_LIBS TRUE)
+IF(${STATIC_RUNTIME})
+ SET(OPENSSL_MSVC_STATIC_RT TRUE)
+ENDIF(${STATIC_RUNTIME})
+find_package(OpenSSL COMPONENTS Crypto QUIET)
IF(OPENSSL_FOUND)
MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION}")
-ELSE(OPENSSL_FOUND)
- MESSAGE(STATUS "OpenSSL not found")
ENDIF(OPENSSL_FOUND)
if(UNIX) #this is true for all the linux systems but not for cross compiling "linux->windows"
+ IF(${STATIC_RUNTIME})
+ set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
+ ENDIF(${STATIC_RUNTIME})
IF(NOT OPENSSL_FOUND)
MESSAGE(SEND_ERROR "Openssl required in Linux, please install it or specify -DOPENSSL_ROOT")
ENDIF(NOT OPENSSL_FOUND)
+ #Zlib required when openssl version < 1.0.1f (centos 7)
+ IF(OPENSSL_VERSION VERSION_LESS 1.0.2)
+ SET ( ZLIB_USE_STATIC_LIBS ON )
+ find_package(ZLIB REQUIRED)
+ list(APPEND EXTERNAL_LIBS ${ZLIB_LIBRARIES})
+ MESSAGE(STATUS "Found zlib version ${ZLIB_VERSION_STRING} ")
+ ENDIF(OPENSSL_VERSION VERSION_LESS 1.0.2)
find_package(Threads)
if(THREADS_HAVE_PTHREAD_ARG)
list(APPEND EXTERNAL_LIBS "-pthread")
@@ -59,16 +69,11 @@
find_program( MEMORYCHECK_COMMAND valgrind )
set( MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full" )
-
- if(USE_DBUS_IDENTIFIER)
- FIND_PACKAGE(Dbus REQUIRED)
- add_definitions(-DUSE_DBUS)
- include_directories(${DBUS_INCLUDE_DIR})
- include_directories(${DBUS_ARCH_INCLUDE_DIR})
- list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES})
- endif(USE_DBUS_IDENTIFIER)
set(main_lib_dest "lib/${PROJECT_NAME}")
else(UNIX)
+ IF(NOT OPENSSL_FOUND)
+ MESSAGE(STATUS "Openssl not found, configuring the library without it (running in wine not supported).")
+ ENDIF(NOT OPENSSL_FOUND)
if(MSVC)
include(target_arch)
target_architecture( TARGET_ARCHITECTURE )
@@ -145,6 +150,7 @@
MARK_AS_ADVANCED(BUILDNAME)
add_subdirectory(test)
ENDIF(BUILD_TESTING)
+ add_subdirectory("src/inspector")
ELSE(Boost_FOUND)
message(WARNING "Boost not found, disabling tests")
ENDIF(Boost_FOUND)
--
Gitblit v1.9.1