diff options
author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-08-10 10:56:54 +0200 |
---|---|---|
committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-08-10 10:56:54 +0200 |
commit | 1ae9dcd4ae312d497f8aa2381efee1b49b727a90 (patch) | |
tree | 685693acdb44cc51424b7b25877cd6a2d0d82fe6 /test/CMakeLists.txt | |
parent | bf30a848ad7ac00218aab6589df7a19d868728cd (diff) | |
parent | 859a6a6802e1891628af988a83a3e24b5b75c007 (diff) | |
download | libuca-1ae9dcd4ae312d497f8aa2381efee1b49b727a90.tar.gz libuca-1ae9dcd4ae312d497f8aa2381efee1b49b727a90.tar.bz2 libuca-1ae9dcd4ae312d497f8aa2381efee1b49b727a90.tar.xz libuca-1ae9dcd4ae312d497f8aa2381efee1b49b727a90.zip |
Merge branch 'ipe-basler'
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'test/CMakeLists.txt')
-rw-r--r-- | test/CMakeLists.txt | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4f3bdc8..4686b84 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -16,6 +16,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/control.glade ${CMAKE_CURRENT_BINARY_ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/run.py ${CMAKE_CURRENT_BINARY_DIR}) # --- Build targets ----------------------------------------------------------- + include_directories( ${GLIB2_INCLUDE_DIRS} ${GOBJECT2_INCLUDE_DIRS} @@ -25,6 +26,19 @@ include_directories( message("${CMAKE_CURRENT_SOURCE_DIR}") +if (HAVE_PYLON_CAMERA) + set(GENICAM_ROOT $ENV{PYLON_ROOT}/genicam) + # check for 32/64 bit + if (CMAKE_SIZEOF_VOID_P EQUAL 8) + set(PYLON_LIB_DIRS $ENV{PYLON_ROOT}/lib64 $ENV{PYLON_ROOT}/bin ${GENICAM_ROOT}/bin/Linux64_x64 + ${GENICAM_ROOT}/bin/Linux64_x64/GenApi/Generic) + else() + set(PYLON_LIB_DIRS $ENV{PYLON_ROOT}/lib64 $ENV{PYLON_ROOT}/bin ${GENICAM_ROOT}/bin/Linux32_i86 + ${GENICAM_ROOT}/bin/Linux32_i86/GenApi/Generic) + endif() + link_directories(${PYLON_LIB_DIRS} ${LIBPYLONCAM_LIBDIR}) +endif() + add_executable(grab grab.c) add_executable(grab-async grab-async.c) add_executable(benchmark benchmark.c) @@ -33,7 +47,14 @@ target_link_libraries(benchmark uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES}) target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES}) target_link_libraries(grab-async uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES}) -if (GTK2_FOUND) +add_executable(grab_pylon grab_pylon.c) +target_link_libraries(grab_pylon uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES}) + +if (NOT DEFINED WITH_CONTROL_GUI) + set(WITH_CONTROL_GUI TRUE) +endif() + +if (GTK2_FOUND AND WITH_CONTROL_GUI) include_directories(${GTK2_INCLUDE_DIRS}) add_executable(control |