From 33434eab0a78edf7a4c688e9f587cf516cb283bf Mon Sep 17 00:00:00 2001 From: Gabriele Contini <contini.mailing@gmail.com> Date: 周六, 30 11月 2019 23:24:58 +0800 Subject: [PATCH] fix centos --- CMakeLists.txt | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e24dcfb..882174e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,8 +62,8 @@ SET ( OPENSSL_USE_STATIC_LIBS ON ) find_package(OpenSSL REQUIRED COMPONENTS Crypto) include_directories(${OPENSSL_INCLUDE_DIR}) - #list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY}) MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION} ") + find_package(Threads) if(THREADS_HAVE_PTHREAD_ARG) list(APPEND EXTERNAL_LIBS "-pthread") @@ -72,12 +72,10 @@ list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT}") endif() endif(THREADS_HAVE_PTHREAD_ARG) - #Zlib required when openssl version < 1.0.1f - #SET ( ZLIB_USE_STATIC_LIBS ON ) - #find_package(ZLIB REQUIRED) - #MESSAGE(STATUS "Found zlib version ${ZLIB_VERSION} ") + 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) @@ -85,9 +83,6 @@ include_directories(${DBUS_ARCH_INCLUDE_DIR}) list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES}) endif(USE_DBUS_IDENTIFIER) - #if(NOT MINGW) - # list(APPEND EXTERNAL_LIBS ${CMAKE_DL_LIBS}) - #endif(NOT MINGW) endif(UNIX) #initialize project -- Gitblit v1.9.1