From e46af93bcc91a1f5660c22ade7c9dedead5a772a Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 30 11月 2019 23:24:58 +0800
Subject: [PATCH] fix centos
---
CMakeLists.txt | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a5ccea..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
@@ -119,6 +114,7 @@
message( STATUS "Project name : " ${LCC_PROJECT_NAME} )
message( STATUS "Project base dir : " ${LCC_PROJECTS_BASE_DIR}/${LCC_PROJECT_NAME} )
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)
add_subdirectory(src)
#boost is required only for tests
@@ -133,7 +129,7 @@
message(STATUS "Compiler architecture: ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}")
endif()
SET( Boost_USE_STATIC_LIBS ON )
-find_package(Boost REQUIRED COMPONENTS unit_test_framework system filesystem)
+find_package(Boost COMPONENTS unit_test_framework system filesystem)
#if boost is found enable tests
IF(Boost_FOUND)
@@ -146,6 +142,3 @@
ELSE(Boost_FOUND)
message(WARNING "Boost not found, disabling tests")
ENDIF(Boost_FOUND)
-
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)
-
\ No newline at end of file
--
Gitblit v1.9.1