From 0e4338b82c6995f4b8647ec668a752b69085c052 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Wed, 9 Apr 2014 12:09:54 +0200 Subject: Make pylon plugin compatible with current libuca --- plugins/pylon/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/pylon/CMakeLists.txt') diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt index 7e573f1..3f8569c 100644 --- a/plugins/pylon/CMakeLists.txt +++ b/plugins/pylon/CMakeLists.txt @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 2.6) project(ucapylon C) -set(VERSION "1.0.0") +set(VERSION "1.1.0") find_package(Pylon) if (PYLON_FOUND) set(UCA_CAMERA_NAME "pylon") + set(PLUGIN_REVISION "1") set(PLUGIN_VERSION ${VERSION}) - set(PLUGIN_REVISION "2") 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.") @@ -25,10 +25,10 @@ if (PYLON_FOUND) create_enums(uca-pylon-enums ${CMAKE_CURRENT_SOURCE_DIR}/../../src/uca-enums uca-pylon-camera.h) - + add_library(ucapylon SHARED - uca-pylon-enums.c - uca-pylon-camera.c) + uca-pylon-camera.c + uca-pylon-enums.c) target_link_libraries(ucapylon ${UCA_DEPS} -- cgit v1.2.3 From 10c2e35112d43c06fc715014b33094761f01c992 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Wed, 9 Apr 2014 14:58:01 +0200 Subject: Remove unnecessary allocation We now require libpyloncam 0.3.0 or better and got rid of a unnecessary memory check and allocation --- 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 3f8569c..5864b84 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.0") +set(VERSION "1.1.1") 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.2.3") + set(PLUGIN_REQUIRES "libuca >= 1.3.0, libpyloncam >= 0.3.0") set(PLUGIN_VENDOR "ANKA Computing Group") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in -- cgit v1.2.3