diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2012-03-05 17:20:27 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2012-03-05 17:20:27 +0100 |
| commit | 03739354e074c547d99a6992a7774c3643d17da1 (patch) | |
| tree | 37091acf1b6101493f9243fbd5b5201be951fdce /src/CMakeLists.txt | |
| parent | 0483c86add2f496021560b82476d22e2497006be (diff) | |
| download | uca-03739354e074c547d99a6992a7774c3643d17da1.tar.gz uca-03739354e074c547d99a6992a7774c3643d17da1.tar.bz2 uca-03739354e074c547d99a6992a7774c3643d17da1.tar.xz uca-03739354e074c547d99a6992a7774c3643d17da1.zip | |
Add factory method to create new cameras
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b3650f6..6b413dd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,7 +24,6 @@ find_package(ClSerMe4) # --- Miscellanous packages find_package(PkgConfig) -find_package(Threads) pkg_check_modules(GLIB2 glib-2.0>=2.24 REQUIRED) pkg_check_modules(GOBJECT2 gobject-2.0>=2.24 REQUIRED) @@ -34,7 +33,7 @@ set(uca_LIBS ${GOBJECT2_LIBRARIES}) # --- Build options ----------------------------------------------------------- -option(HAVE_DUMMY_CAMERA "Camera: Dummy" OFF) +option(HAVE_MOCK_CAMERA "Camera: Dummy" OFF) # --- Add sources if camera/framegrabber access sources are available --------- @@ -81,18 +80,11 @@ if (IPE_FOUND) endif() endif() -if (HAVE_DUMMY_CAMERA) +if (HAVE_MOCK_CAMERA) set(uca_SRCS ${uca_SRCS} cameras/uca-mock-camera.c) set(uca_HDRS ${uca_HDRS} cameras/uca-mock-camera.h) endif() -if (Threads_FOUND) - set(HAVE_PTHREADS TRUE) - - set(uca_LIBS - ${uca_LIBS} - ${CMAKE_THREAD_LIBS_INIT}) -endif() # --- Configure step configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in |