summaryrefslogtreecommitdiffstats
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-03-17 10:13:42 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-03-17 10:13:42 +0100
commit5b80e3c687fb2b47b06d9ffe6ac07bec475d812a (patch)
treee3b8fb492e3cd01d0a071e7872b50e1dee3cc7f1 /src/CMakeLists.txt
parent31b20f08150907fadc05e5054f4ffd04f68d2144 (diff)
downloaduca-5b80e3c687fb2b47b06d9ffe6ac07bec475d812a.tar.gz
uca-5b80e3c687fb2b47b06d9ffe6ac07bec475d812a.tar.bz2
uca-5b80e3c687fb2b47b06d9ffe6ac07bec475d812a.tar.xz
uca-5b80e3c687fb2b47b06d9ffe6ac07bec475d812a.zip
Make uca_init() and uca_destroy() thread-safe via pthreads
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c25ca7..df1ed43 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,8 +29,7 @@ find_package(ClSerMe4)
# --- Miscellanous packages
find_package(PkgConfig)
-
-pkg_check_modules(MJSON mjson-1.2)
+find_package(Threads)
# --- Build options -----------------------------------------------------------
@@ -113,15 +112,13 @@ if (HAVE_DUMMY_CAMERA)
)
endif()
-if (MJSON_FOUND)
- set(HAVE_MJSON TRUE)
+if (Threads_FOUND)
+ set(HAVE_PTHREADS TRUE)
set(uca_LIBS
${uca_LIBS}
- ${MJSON_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
)
-
- include_directories(${MJSON_INCLUDE_DIRS})
endif()
# --- Configure step