From b5c90a21f289bb67c4806a8563d96fc674bba583 Mon Sep 17 00:00:00 2001
From: Volker Kaiser <volker.kaiser@softwareschneiderei.de>
Date: Tue, 24 Apr 2012 08:53:21 +0200
Subject: pylon (basler) camera added

---
 test/CMakeLists.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9050ce5..f6ca865 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -16,6 +16,18 @@ 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 -----------------------------------------------------------
+#add_executable(enum enum.c)
+add_executable(grab grab.c)
+add_executable(grab_pylon grab_pylon.c)
+#add_executable(grab-async grab-async.c)
+#add_executable(benchmark benchmark.c)
+
+#target_link_libraries(enum uca)
+target_link_libraries(grab uca-gobject ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
+target_link_libraries(grab_pylon uca-gobject ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
+#target_link_libraries(grab-async uca)
+#target_link_libraries(benchmark uca)
+
 include_directories(
     ${GLIB2_INCLUDE_DIRS}
     ${GOBJECT2_INCLUDE_DIRS}
-- 
cgit v1.2.3


From 9395f3ed8c69c7873c187d8a93b4755b685b3c96 Mon Sep 17 00:00:00 2001
From: Volker Kaiser <volker.kaiser@softwareschneiderei.de>
Date: Tue, 26 Jun 2012 08:53:11 +0200
Subject: working on basler

---
 test/CMakeLists.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f6ca865..873b85f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -17,14 +17,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/run.py ${CMAKE_CURRENT_BINARY_DIR})
 
 # --- Build targets -----------------------------------------------------------
 #add_executable(enum enum.c)
-add_executable(grab grab.c)
-add_executable(grab_pylon grab_pylon.c)
 #add_executable(grab-async grab-async.c)
 #add_executable(benchmark benchmark.c)
 
 #target_link_libraries(enum uca)
-target_link_libraries(grab uca-gobject ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
-target_link_libraries(grab_pylon uca-gobject ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 #target_link_libraries(grab-async uca)
 #target_link_libraries(benchmark uca)
 
@@ -43,6 +39,9 @@ add_executable(grab-async grab-async.c)
 target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 target_link_libraries(grab-async uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 
+add_executable(grab_pylon grab_pylon.c)
+target_link_libraries(grab_pylon uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
+
 if (GTK2_FOUND)
     include_directories(${GTK2_INCLUDE_DIRS})
 
-- 
cgit v1.2.3


From 0b5720d0414f7e9f196664677899e999179a49f6 Mon Sep 17 00:00:00 2001
From: Volker Kaiser <volker.kaiser@softwareschneiderei.de>
Date: Wed, 1 Aug 2012 14:06:50 +0200
Subject: extracted pylon_camera C-wrapper into own project; enhanced cmake
 build for pylon cameras

---
 test/CMakeLists.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 873b85f..36a5fd3 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -33,6 +33,20 @@ 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()
+  message("PYLON LIB DIRS ${PYLON_LIB_DIRS}")
+  link_directories(${PYLON_LIB_DIRS})
+endif()
+
 add_executable(grab grab.c)
 add_executable(grab-async grab-async.c)
 
-- 
cgit v1.2.3


From 3e1c17378f21a737de85ad4c0e07210be9fcd5dd Mon Sep 17 00:00:00 2001
From: Volker Kaiser <volker.kaiser@softwareschneiderei.de>
Date: Wed, 1 Aug 2012 14:12:23 +0200
Subject: reduced differences to master

---
 test/CMakeLists.txt | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 36a5fd3..5fb8133 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -16,13 +16,6 @@ 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 -----------------------------------------------------------
-#add_executable(enum enum.c)
-#add_executable(grab-async grab-async.c)
-#add_executable(benchmark benchmark.c)
-
-#target_link_libraries(enum uca)
-#target_link_libraries(grab-async uca)
-#target_link_libraries(benchmark uca)
 
 include_directories(
     ${GLIB2_INCLUDE_DIRS}
-- 
cgit v1.2.3


From 6683a6e9a6fc0259d5e5dfd97279680e292d7938 Mon Sep 17 00:00:00 2001
From: Volker Kaiser <volker.kaiser@softwareschneiderei.de>
Date: Wed, 1 Aug 2012 14:58:46 +0200
Subject: fixed pylon build

---
 test/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5fb8133..4cd43ce 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -36,7 +36,6 @@ if (HAVE_PYLON_CAMERA)
     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()
-  message("PYLON LIB DIRS ${PYLON_LIB_DIRS}")
   link_directories(${PYLON_LIB_DIRS})
 endif()
 
-- 
cgit v1.2.3


From 12c4c985c11ae9fa4bea7ff4f54176f92168324f Mon Sep 17 00:00:00 2001
From: Volker Kaiser <volker.kaiser@softwareschneiderei.de>
Date: Thu, 2 Aug 2012 11:50:24 +0200
Subject: use LIBPYLONCAM_LIBDIR also in tests

---
 test/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4cd43ce..2ddc464 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -36,7 +36,7 @@ if (HAVE_PYLON_CAMERA)
     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})
+  link_directories(${PYLON_LIB_DIRS} ${LIBPYLONCAM_LIBDIR})
 endif()
 
 add_executable(grab grab.c)
-- 
cgit v1.2.3


From d5881265ee7c3995508aaa84275be498e30c5c8b Mon Sep 17 00:00:00 2001
From: Volker Kaiser <volker.kaiser@softwareschneiderei.de>
Date: Thu, 2 Aug 2012 14:49:11 +0200
Subject: added variables with which building of test/control and reference
 documentation can be disabled

---
 test/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2ddc464..5797621 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -48,7 +48,11 @@ target_link_libraries(grab-async uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 add_executable(grab_pylon grab_pylon.c)
 target_link_libraries(grab_pylon uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 
-if (GTK2_FOUND)
+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 
-- 
cgit v1.2.3