From 806b1356e99ec4f51b32c567c720e7f6154203c9 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 30 11月 2019 17:14:22 +0800
Subject: [PATCH] add pthread to external libs
---
CMakeLists.txt | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e38482..dd4700d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,15 +62,15 @@
find_package(OpenSSL REQUIRED COMPONENTS Crypto)
include_directories(${OPENSSL_INCLUDE_DIR})
#list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
- #find_package(Threads)
- #if(THREADS_HAVE_PTHREAD_ARG)
- # list(APPEND EXTERNAL_LIBS "-pthread")
- #else(THREADS_HAVE_PTHREAD_ARG)
- # if(CMAKE_THREAD_LIBS_INIT)
- # list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT}")
- # endif()
- #endif(THREADS_HAVE_PTHREAD_ARG)
MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION} ")
+ find_package(Threads)
+ if(THREADS_HAVE_PTHREAD_ARG)
+ list(APPEND EXTERNAL_LIBS "-pthread")
+ else(THREADS_HAVE_PTHREAD_ARG)
+ if(CMAKE_THREAD_LIBS_INIT)
+ 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)
@@ -84,9 +84,9 @@
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)
+ #if(NOT MINGW)
+ # list(APPEND EXTERNAL_LIBS ${CMAKE_DL_LIBS})
+ #endif(NOT MINGW)
endif(UNIX)
#initialize project
--
Gitblit v1.9.1