Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ambrop72/badvpn.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmbroz Bizjak <ambrop7@gmail.com>2016-09-06 21:45:59 +0300
committerAmbroz Bizjak <ambrop7@gmail.com>2016-09-06 21:46:25 +0300
commite4c152027c7e5f61fa4b8eaace45546635dae643 (patch)
treec5df0b621f76ada4ddb1155193fefcb3578167ea
parentce8eb3c1ac69b06c80ec9ec5ca4d2081f665a67c (diff)
Fix possible compile error after switch to pthread_sigmask.
-rw-r--r--CMakeLists.txt2
-rw-r--r--threadwork/CMakeLists.txt7
2 files changed, 2 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5776fb..d110619 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -169,7 +169,7 @@ else ()
add_definitions(-DBADVPN_THREADWORK_USE_PTHREAD)
add_definitions(-DBADVPN_THREAD_SAFE=1)
- link_libraries(rt)
+ link_libraries(rt pthread)
if (EMSCRIPTEN)
add_definitions(-DBADVPN_EMSCRIPTEN)
diff --git a/threadwork/CMakeLists.txt b/threadwork/CMakeLists.txt
index 5f223ae..c9bbe02 100644
--- a/threadwork/CMakeLists.txt
+++ b/threadwork/CMakeLists.txt
@@ -1,6 +1 @@
-set(BADVPN_THREADWORK_EXTRA_LIBS)
-if (BADVPN_THREADWORK_USE_PTHREAD)
- list(APPEND BADVPN_THREADWORK_EXTRA_LIBS pthread)
-endif ()
-
-badvpn_add_library(threadwork "system" "${BADVPN_THREADWORK_EXTRA_LIBS}" BThreadWork.c)
+badvpn_add_library(threadwork "system" "" BThreadWork.c)