From b5c90a21f289bb67c4806a8563d96fc674bba583 Mon Sep 17 00:00:00 2001 From: Volker Kaiser Date: Tue, 24 Apr 2012 08:53:21 +0200 Subject: pylon (basler) camera added --- src/CMakeLists.txt | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 02a1005..5a3c014 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 2.8) +set(CMAKE_VERBOSE_MAKEFILE TRUE) # --- Set sources ------------------------------------------------------------- set(uca_SRCS @@ -14,13 +15,14 @@ set(cameras) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) # --- Find camera interfaces -find_package(PCO) +#find_package(PCO) find_package(PF) find_package(IPE) +find_package(Pylon) # --- Find frame grabber interfaces -find_package(FgLib5) -find_package(ClSerMe4) +#find_package(FgLib5) +#find_package(ClSerMe4) # --- Miscellanous packages find_package(PkgConfig) @@ -90,6 +92,19 @@ if (IPE_FOUND) endif() endif() +if (PYLON_FOUND) + option(HAVE_PYLON_CAMERA "Camera: Pylon based (Basler)" ON) + + if (HAVE_PYLON_CAMERA) + set(uca_SRCS ${uca_SRCS} cameras/uca-pylon-camera.c cameras/pylon_camera.cpp) + set(uca_HDRS ${uca_HDRS} cameras/uca-pylon-camera.h) + set(uca_LIBS ${uca_LIBS} ${PYLON_LIBS}) + + include_directories(${PYLON_INCLUDE_DIRS}) + endif() + +endif() + if (HAVE_MOCK_CAMERA) list(APPEND uca_SRCS cameras/uca-mock-camera.c) list(APPEND uca_HDRS cameras/uca-mock-camera.h) -- cgit v1.2.3 From 38d6d18e83b0c33a18ef6f68c22c161d39abc449 Mon Sep 17 00:00:00 2001 From: Volker Kaiser Date: Tue, 8 May 2012 14:49:11 +0200 Subject: basler camera works --- src/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5a3c014..9630a72 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,14 +15,14 @@ set(cameras) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) # --- Find camera interfaces -#find_package(PCO) +find_package(PCO) find_package(PF) find_package(IPE) find_package(Pylon) # --- Find frame grabber interfaces -#find_package(FgLib5) -#find_package(ClSerMe4) +find_package(FgLib5) +find_package(ClSerMe4) # --- Miscellanous packages find_package(PkgConfig) @@ -101,6 +101,7 @@ if (PYLON_FOUND) set(uca_LIBS ${uca_LIBS} ${PYLON_LIBS}) include_directories(${PYLON_INCLUDE_DIRS}) + link_directories(/opt/pylon/lib64) endif() endif() -- cgit v1.2.3 From 9395f3ed8c69c7873c187d8a93b4755b685b3c96 Mon Sep 17 00:00:00 2001 From: Volker Kaiser Date: Tue, 26 Jun 2012 08:53:11 +0200 Subject: working on basler --- src/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9630a72..46bcfb2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,7 +15,7 @@ set(cameras) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) # --- Find camera interfaces -find_package(PCO) +#find_package(PCO) find_package(PF) find_package(IPE) find_package(Pylon) @@ -99,6 +99,7 @@ if (PYLON_FOUND) set(uca_SRCS ${uca_SRCS} cameras/uca-pylon-camera.c cameras/pylon_camera.cpp) set(uca_HDRS ${uca_HDRS} cameras/uca-pylon-camera.h) set(uca_LIBS ${uca_LIBS} ${PYLON_LIBS}) + #list(APPEND cameras "Pylon") include_directories(${PYLON_INCLUDE_DIRS}) link_directories(/opt/pylon/lib64) @@ -241,7 +242,7 @@ if(GTK_DOC_FOUND) DEPENDS ${docs_out}/sgml.stamp ${docs_out}/uca-docs.xml WORKING_DIRECTORY ${docs_out}) - add_custom_target(reference ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html.stamp) + add_custom_target(reference DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html.stamp) install(FILES ${reference_files} DESTINATION share/gtk-doc/html/uca) endif() -- cgit v1.2.3 From 67e3daeb2ad9d9835c4e19a1edd744cba92b83d1 Mon Sep 17 00:00:00 2001 From: Volker Kaiser Date: Thu, 26 Jul 2012 09:12:00 +0200 Subject: SCHNEIDE-255 (ROI support basler) --- src/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 46bcfb2..931ca9b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -96,13 +96,13 @@ if (PYLON_FOUND) option(HAVE_PYLON_CAMERA "Camera: Pylon based (Basler)" ON) if (HAVE_PYLON_CAMERA) - set(uca_SRCS ${uca_SRCS} cameras/uca-pylon-camera.c cameras/pylon_camera.cpp) - set(uca_HDRS ${uca_HDRS} cameras/uca-pylon-camera.h) - set(uca_LIBS ${uca_LIBS} ${PYLON_LIBS}) - #list(APPEND cameras "Pylon") + list(APPEND uca_SRCS cameras/uca-pylon-camera.c cameras/pylon_camera.cpp) + list(APPEND uca_HDRS cameras/uca-pylon-camera.h) + list(APPEND cameras "Pylon") + set(uca_LIBS ${uca_LIBS} ${PYLON_LIBS}) - include_directories(${PYLON_INCLUDE_DIRS}) - link_directories(/opt/pylon/lib64) + include_directories(${PYLON_INCLUDE_DIRS}) + link_directories(/opt/pylon/lib64) endif() endif() -- cgit v1.2.3 From 0b5720d0414f7e9f196664677899e999179a49f6 Mon Sep 17 00:00:00 2001 From: Volker Kaiser Date: Wed, 1 Aug 2012 14:06:50 +0200 Subject: extracted pylon_camera C-wrapper into own project; enhanced cmake build for pylon cameras --- src/CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 931ca9b..13d677a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,7 +15,7 @@ set(cameras) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) # --- Find camera interfaces -#find_package(PCO) +find_package(PCO) find_package(PF) find_package(IPE) find_package(Pylon) @@ -96,13 +96,12 @@ if (PYLON_FOUND) option(HAVE_PYLON_CAMERA "Camera: Pylon based (Basler)" ON) if (HAVE_PYLON_CAMERA) - list(APPEND uca_SRCS cameras/uca-pylon-camera.c cameras/pylon_camera.cpp) + list(APPEND uca_SRCS cameras/uca-pylon-camera.c) list(APPEND uca_HDRS cameras/uca-pylon-camera.h) list(APPEND cameras "Pylon") - set(uca_LIBS ${uca_LIBS} ${PYLON_LIBS}) + set(uca_LIBS ${uca_LIBS} ${PYLON_LIB}) - include_directories(${PYLON_INCLUDE_DIRS}) - link_directories(/opt/pylon/lib64) + include_directories(${PYLON_INCLUDE_DIR}) endif() endif() -- cgit v1.2.3 From 3e1c17378f21a737de85ad4c0e07210be9fcd5dd Mon Sep 17 00:00:00 2001 From: Volker Kaiser Date: Wed, 1 Aug 2012 14:12:23 +0200 Subject: reduced differences to master --- src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 13d677a..c114cce 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 2.8) -set(CMAKE_VERBOSE_MAKEFILE TRUE) # --- Set sources ------------------------------------------------------------- set(uca_SRCS -- cgit v1.2.3 From 6683a6e9a6fc0259d5e5dfd97279680e292d7938 Mon Sep 17 00:00:00 2001 From: Volker Kaiser Date: Wed, 1 Aug 2012 14:58:46 +0200 Subject: fixed pylon build --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c114cce..9238106 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -98,9 +98,9 @@ if (PYLON_FOUND) list(APPEND uca_SRCS cameras/uca-pylon-camera.c) list(APPEND uca_HDRS cameras/uca-pylon-camera.h) list(APPEND cameras "Pylon") - set(uca_LIBS ${uca_LIBS} ${PYLON_LIB}) + set(uca_LIBS ${uca_LIBS} ${LIBPYLONCAM_LIBRARIES}) - include_directories(${PYLON_INCLUDE_DIR}) + include_directories(${LIBPYLONCAM_INCLUDEDIR}) endif() endif() -- cgit v1.2.3 From 91daa3bdebd1fc1e368ff9fa2e99b4ea1131361e Mon Sep 17 00:00:00 2001 From: Volker Kaiser Date: Thu, 2 Aug 2012 11:44:17 +0200 Subject: using LIBDIR --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9238106..acba8a4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -101,6 +101,7 @@ if (PYLON_FOUND) set(uca_LIBS ${uca_LIBS} ${LIBPYLONCAM_LIBRARIES}) include_directories(${LIBPYLONCAM_INCLUDEDIR}) + link_directories(${LIBPYLONCAM_LIBDIR}) endif() endif() -- cgit v1.2.3 From d5881265ee7c3995508aaa84275be498e30c5c8b Mon Sep 17 00:00:00 2001 From: Volker Kaiser Date: Thu, 2 Aug 2012 14:49:11 +0200 Subject: added variables with which building of test/control and reference documentation can be disabled --- src/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index acba8a4..3c80afd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -162,8 +162,11 @@ target_link_libraries(uca # --- Build documentation ----------------------------------------------------- +if (NOT DEFINED WITH_REFERENCE) + set(WITH_REFERENCE TRUE) +endif() pkg_check_modules(GTK_DOC gtk-doc) -if(GTK_DOC_FOUND) +if(GTK_DOC_FOUND AND WITH_REFERENCE) option(WITH_GTK_DOC "Build documentation" ON) if (WITH_GTK_DOC) set(docs_dir "${CMAKE_CURRENT_BINARY_DIR}") @@ -245,7 +248,7 @@ if(GTK_DOC_FOUND) install(FILES ${reference_files} DESTINATION share/gtk-doc/html/uca) endif() -endif(GTK_DOC_FOUND) +endif(GTK_DOC_FOUND AND WITH_REFERENCE) # --- Install target ---------------------------------------------------------- -- cgit v1.2.3 From 081f4ab3e06cf343052b01132bb762485b2a2554 Mon Sep 17 00:00:00 2001 From: Volker Kaiser Date: Thu, 2 Aug 2012 16:14:44 +0200 Subject: added support for libuca.spec.in --- src/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3c80afd..eab7a54 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -282,7 +282,9 @@ set(CPACK_PACKAGE_NAME "libuca") # --- Distro specific set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3.6), libgcc1 (>= 1:4.1)") -set(CPACK_SET_DESTDIR ON) + +# this doesn't work when building RPMs on Jenkins +#set(CPACK_SET_DESTDIR ON) set(CPACK_PACKAGE_CONTACT "Matthias Vogelgesang") set(CPACK_PACKAGE_VENDOR "Karlsruhe Institute of Technology/IPE") @@ -297,4 +299,7 @@ set(CPACK_SOURCE_IGNORE_FILES ".git" "tags" ".bzr" ".swp") set(CPACK_SOURCE_PACKAGE_FILE_NAME "libuca-${UCA_VERSION_STRING}" CACHE INTERNAL "tarball basename") set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${UCA_VERSION_STRING}-${CMAKE_SYSTEM_PROCESSOR}") +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../libuca.spec.in" + "${CMAKE_CURRENT_BINARY_DIR}/../libuca.spec" @ONLY IMMEDIATE) + include(CPack) -- cgit v1.2.3 From 24587b5bfac1bc8bb16d16df692baed5c267ec25 Mon Sep 17 00:00:00 2001 From: Volker Kaiser Date: Tue, 7 Aug 2012 12:20:24 +0200 Subject: enabled DESTDIR --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eab7a54..4e14787 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -284,7 +284,7 @@ set(CPACK_PACKAGE_NAME "libuca") set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3.6), libgcc1 (>= 1:4.1)") # this doesn't work when building RPMs on Jenkins -#set(CPACK_SET_DESTDIR ON) +set(CPACK_SET_DESTDIR ON) set(CPACK_PACKAGE_CONTACT "Matthias Vogelgesang") set(CPACK_PACKAGE_VENDOR "Karlsruhe Institute of Technology/IPE") -- cgit v1.2.3