From 79b1b57045e86d9845e352c3f2aa0efbab6111a9 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 14 3月 2020 10:19:09 +0800
Subject: [PATCH] tests and improvements
---
CMakeLists.txt | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3edd0cc..3cb66f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,24 +40,18 @@
ENDIF(${STATIC_RUNTIME})
find_package(OpenSSL COMPONENTS Crypto QUIET)
IF(OPENSSL_FOUND)
- MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION}")
+ MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION} -licensecc")
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")
+ #SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
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} - licensecc")
- ENDIF(OPENSSL_VERSION VERSION_LESS 1.0.2)
find_package(Threads)
if(THREADS_HAVE_PTHREAD_ARG)
list(APPEND EXTERNAL_LIBS "-pthread")
@@ -66,6 +60,16 @@
list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT}")
endif()
endif(THREADS_HAVE_PTHREAD_ARG)
+
+ #Zlib required when openssl version < 1.0.1f (centos 7)
+ IF(OPENSSL_VERSION VERSION_LESS_EQUAL 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} - licensecc")
+ ELSE(OPENSSL_VERSION VERSION_LESS_EQUAL 1.0.2)
+ MESSAGE(STATUS "openssl ${OPENSSL_VERSION} zlib not required - licensecc")
+ ENDIF(OPENSSL_VERSION VERSION_LESS_EQUAL 1.0.2)
find_program( MEMORYCHECK_COMMAND valgrind )
set( MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full" )
--
Gitblit v1.9.1