From fb8cd3a6a49f7591cc504c0a78035ac1ef4467d8 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 29 Jul 2014 13:19:50 +0200 Subject: Minor reformatting in pylon plugin build script --- plugins/pylon/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'plugins/pylon/CMakeLists.txt') diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt index 5864b84..1265e8c 100644 --- a/plugins/pylon/CMakeLists.txt +++ b/plugins/pylon/CMakeLists.txt @@ -30,9 +30,7 @@ if (PYLON_FOUND) uca-pylon-camera.c uca-pylon-enums.c) - target_link_libraries(ucapylon - ${UCA_DEPS} - ${LIBPYLONCAM_LIBRARIES}) + target_link_libraries(ucapylon ${UCA_DEPS} ${LIBPYLONCAM_LIBRARIES}) install(TARGETS ucapylon LIBRARY DESTINATION ${UCA_PLUGINDIR} -- cgit v1.2.3 From 6f73f9daa1f9d1ac6054dec6e06b93e040a011f2 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Thu, 31 Jul 2014 16:09:17 +0200 Subject: Update pylon-plugin to libpyloncam 0.4 --- plugins/pylon/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/pylon/CMakeLists.txt') diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt index 1265e8c..02f65c9 100644 --- a/plugins/pylon/CMakeLists.txt +++ b/plugins/pylon/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) project(ucapylon C) -set(VERSION "1.1.1") +set(VERSION "1.2.0") find_package(Pylon) @@ -11,7 +11,7 @@ if (PYLON_FOUND) set(PLUGIN_SUMMARY "Pylon plugin for libuca") set(PLUGIN_CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt") set(PLUGIN_DESCRIPTION "Plugin for the Basler GigE CCD Camera.") - set(PLUGIN_REQUIRES "libuca >= 1.3.0, libpyloncam >= 0.3.0") + set(PLUGIN_REQUIRES "libuca >= 1.3.0, libpyloncam >= 0.4.0") set(PLUGIN_VENDOR "ANKA Computing Group") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in -- cgit v1.2.3 From 8e98707648406e2c7a6831c2f3366a2c34eba617 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Thu, 11 Sep 2014 11:39:11 +0200 Subject: Improve robustness of roi setting for pylon plugin --- plugins/pylon/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/pylon/CMakeLists.txt') diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt index 02f65c9..7ae3288 100644 --- a/plugins/pylon/CMakeLists.txt +++ b/plugins/pylon/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) project(ucapylon C) -set(VERSION "1.2.0") +set(VERSION "1.2.1") find_package(Pylon) -- cgit v1.2.3 From f2394f593a552f1c3d29ce894b5cd28914b884b7 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 7 Oct 2014 12:22:52 +0200 Subject: Implement auto exposure property for pylon plugin Conflicts: plugins/pylon/CMakeLists.txt plugins/pylon/changelog.txt plugins/pylon/uca-pylon-camera.c --- plugins/pylon/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/pylon/CMakeLists.txt') diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt index 7ae3288..69f668d 100644 --- a/plugins/pylon/CMakeLists.txt +++ b/plugins/pylon/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) project(ucapylon C) -set(VERSION "1.2.1") +set(VERSION "1.3.0") find_package(Pylon) @@ -11,7 +11,7 @@ if (PYLON_FOUND) set(PLUGIN_SUMMARY "Pylon plugin for libuca") set(PLUGIN_CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt") set(PLUGIN_DESCRIPTION "Plugin for the Basler GigE CCD Camera.") - set(PLUGIN_REQUIRES "libuca >= 1.3.0, libpyloncam >= 0.4.0") + set(PLUGIN_REQUIRES "libuca >= 1.3.0, libpyloncam >= 0.5.0") set(PLUGIN_VENDOR "ANKA Computing Group") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in -- cgit v1.2.3