Browse Source

Fix possible compile error after switch to pthread_sigmask.

Ambroz Bizjak 9 years ago
parent
commit
e4c152027c
2 changed files with 2 additions and 7 deletions
  1. 1 1
      CMakeLists.txt
  2. 1 6
      threadwork/CMakeLists.txt

+ 1 - 1
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)

+ 1 - 6
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)