From 6854ad2fd58e0d6fdba465e340efebec06034486 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 30 11月 2019 17:14:22 +0800
Subject: [PATCH] add pthread to external libs
---
/dev/null | 1 -
extern/license-generator | 1 +
CMakeLists.txt | 22 +++++++++++-----------
3 files changed, 12 insertions(+), 12 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
diff --git a/extern/license-generator b/extern/license-generator
deleted file mode 160000
index 9cb1530..0000000
--- a/extern/license-generator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9cb153091edbd55d31e2a1fb1f2e3a2ab5e364b1
diff --git a/extern/license-generator b/extern/license-generator
new file mode 120000
index 0000000..d225022
--- /dev/null
+++ b/extern/license-generator
@@ -0,0 +1 @@
+../../olm-license-generator/
\ No newline at end of file
--
Gitblit v1.9.1