diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-10-31 13:45:25 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-10-31 13:57:57 +0100 |
| commit | d4e6d350305d17ef112417619a1a4e7afe2c60ca (patch) | |
| tree | d6028a5f101761b65c3f7c3a49b7fff4eb9ad2ef | |
| parent | 24dd385aa599f7dadc2015e5f208deb0f345fd21 (diff) | |
| download | libuca-d4e6d350305d17ef112417619a1a4e7afe2c60ca.tar.gz libuca-d4e6d350305d17ef112417619a1a4e7afe2c60ca.tar.bz2 libuca-d4e6d350305d17ef112417619a1a4e7afe2c60ca.tar.xz libuca-d4e6d350305d17ef112417619a1a4e7afe2c60ca.zip | |
Include directory where config.h is located
| -rw-r--r-- | plugins/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugins/dexela/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | plugins/pco/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | plugins/pf/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | plugins/pylon/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | plugins/ufo/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | plugins/xkit/CMakeLists.txt | 4 |
7 files changed, 16 insertions, 6 deletions
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index ff6ebeb..77ef837 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,3 +1,5 @@ +set(UCA_CONFIGDIR "${CMAKE_CURRENT_BINARY_DIR}../src") + add_subdirectory(mock) add_subdirectory(pf) add_subdirectory(pco) diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt index d497f7d..df939c3 100644 --- a/plugins/dexela/CMakeLists.txt +++ b/plugins/dexela/CMakeLists.txt @@ -17,7 +17,8 @@ if (DEXELA_FOUND) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh) - include_directories(${DEXELA_INCLUDE_DIRS}) + include_directories(${DEXELA_INCLUDE_DIRS} + ${UCA_CONFIGDIR}) add_library(ucadexela SHARED uca-dexela-camera.c) diff --git a/plugins/pco/CMakeLists.txt b/plugins/pco/CMakeLists.txt index ea28c2f..9aa888e 100644 --- a/plugins/pco/CMakeLists.txt +++ b/plugins/pco/CMakeLists.txt @@ -14,11 +14,13 @@ if (PCO_FOUND AND CLSERME4_FOUND AND FGLIB5_FOUND) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh) + include_directories(${PCO_INCLUDE_DIRS} ${CLSERME4_INCLUDE_DIR} ${FGLIB5_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR}) + ${CMAKE_CURRENT_BINARY_DIR} + ${UCA_CONFIGDIR}) create_enums(uca-pco-enums ${CMAKE_CURRENT_SOURCE_DIR}/../../src/uca-enums diff --git a/plugins/pf/CMakeLists.txt b/plugins/pf/CMakeLists.txt index a384ae8..c131ede 100644 --- a/plugins/pf/CMakeLists.txt +++ b/plugins/pf/CMakeLists.txt @@ -16,7 +16,8 @@ if (PF_FOUND AND CLSERME4_FOUND AND FGLIB5_FOUND) include_directories(${PF_INCLUDE_DIRS} ${CLSERME4_INCLUDE_DIR} - ${FGLIB5_INCLUDE_DIR}) + ${FGLIB5_INCLUDE_DIR} + ${UCA_CONFIGDIR}) add_library(ucapf SHARED uca-pf-camera.c) diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt index 0e9088d..2e9dde9 100644 --- a/plugins/pylon/CMakeLists.txt +++ b/plugins/pylon/CMakeLists.txt @@ -8,7 +8,8 @@ if (PYLON_FOUND) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh) - include_directories(${LIBPYLONCAM_INCLUDEDIR}) + include_directories(${LIBPYLONCAM_INCLUDEDIR} + ${UCA_CONFIGDIR}) add_library(ucapylon SHARED uca-pylon-camera.c) diff --git a/plugins/ufo/CMakeLists.txt b/plugins/ufo/CMakeLists.txt index b3372d4..0adb0ad 100644 --- a/plugins/ufo/CMakeLists.txt +++ b/plugins/ufo/CMakeLists.txt @@ -12,7 +12,8 @@ if (IPE_FOUND) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh) - include_directories(${IPE_INCLUDE_DIRS}) + include_directories(${IPE_INCLUDE_DIRS} + ${UCA_CONFIGDIR}) add_library(ucaufo SHARED uca-ufo-camera.c) diff --git a/plugins/xkit/CMakeLists.txt b/plugins/xkit/CMakeLists.txt index b82881e..0f06259 100644 --- a/plugins/xkit/CMakeLists.txt +++ b/plugins/xkit/CMakeLists.txt @@ -15,7 +15,9 @@ find_library (XKIT_LIBRARIES if (XKIT_INCLUDE_DIR AND XKIT_LIBRARIES) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh) - include_directories(${XKIT_INCLUDE_DIR}) + + include_directories(${XKIT_INCLUDE_DIR} + ${UCA_CONFIGDIR}) # We have to compile with g++ because the included header files have C++ # style comments ... |