From 99b737ae9f3f1d35a4696594821fa3bc39e8aa87 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Fri, 28 Sep 2012 18:16:56 +0200
Subject: Fix #146: Make a new top-level directory for cams

... and build a package for each camera. Moreover, for some reason we can live
without the CMake generated spec file for RPM generation. AFAICS, the RPMs are
prefixed correctly.
---
 plugins/pylon/CMakeLists.txt | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 plugins/pylon/CMakeLists.txt

(limited to 'plugins/pylon/CMakeLists.txt')

diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt
new file mode 100644
index 0000000..18823a4
--- /dev/null
+++ b/plugins/pylon/CMakeLists.txt
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 2.8)
+project(ucapylon)
+
+find_package(Pylon)
+
+if (PYLON_FOUND)
+    set(UCA_CAMERA_NAME "pylon")
+
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh)
+
+    include_directories(${LIBPYLONCAM_INCLUDEDIR})
+
+    add_library(ucapylon SHARED
+                uca-pylon-camera.c)
+
+    target_link_libraries(ucapylon
+                          ${UCA_DEPS}
+                          ${LIBPYLONCAM_LIBRARIES})
+
+    install(TARGETS ucapylon
+            LIBRARY DESTINATION ${LIB_INSTALL_DIR}/uca
+            COMPONENT ${UCA_CAMERA_NAME})
+endif()
-- 
cgit v1.2.3


From b8d34c22c479bd5def2744eae3a9380d3ff843c2 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@kit.edu>
Date: Mon, 1 Oct 2012 09:08:52 +0200
Subject: Define plugins as C projects

Otherwise CMake complains about non-existent C++ compilers, which are
not needed here anyway.
---
 plugins/pylon/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'plugins/pylon/CMakeLists.txt')

diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt
index 18823a4..9a3c15c 100644
--- a/plugins/pylon/CMakeLists.txt
+++ b/plugins/pylon/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
-project(ucapylon)
+project(ucapylon C)
 
-find_package(Pylon)
 
 if (PYLON_FOUND)
     set(UCA_CAMERA_NAME "pylon")
-- 
cgit v1.2.3