summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMihael Koep <koep@schneide.com>2015-05-18 17:05:08 +0200
committerMihael Koep <koep@schneide.com>2015-05-18 17:26:53 +0200
commit2f3f57cf90e31b9459de3f36824668ec3a51a177 (patch)
tree94266aff8a79a0fdf9150dab2297f70f85299be4
parentf2436c659242ccf0d5bb30a59b81cef8ee0aae99 (diff)
downloaduca-2f3f57cf90e31b9459de3f36824668ec3a51a177.tar.gz
uca-2f3f57cf90e31b9459de3f36824668ec3a51a177.tar.bz2
uca-2f3f57cf90e31b9459de3f36824668ec3a51a177.tar.xz
uca-2f3f57cf90e31b9459de3f36824668ec3a51a177.zip
Camera plugins now require libuca >= 2.0 so update their versions too
Conflicts: plugins/dexela/CMakeLists.txt plugins/dexela/changelog.txt
-rw-r--r--plugins/dexela/CMakeLists.txt2
-rw-r--r--plugins/dexela/changelog.txt3
-rw-r--r--plugins/file/CMakeLists.txt6
-rw-r--r--plugins/mock/CMakeLists.txt4
-rw-r--r--plugins/pco/CMakeLists.txt4
-rw-r--r--plugins/pf/CMakeLists.txt4
-rw-r--r--plugins/pylon/CMakeLists.txt4
-rw-r--r--plugins/pylon/changelog.txt4
-rw-r--r--plugins/ufo/CMakeLists.txt4
9 files changed, 21 insertions, 14 deletions
diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt
index ba1ec2b..d04c2e6 100644
--- a/plugins/dexela/CMakeLists.txt
+++ b/plugins/dexela/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.6)
project(ucadexela C)
-set(VERSION "1.3.3")
+set(VERSION "1.4.0")
find_package(DEXELA)
diff --git a/plugins/dexela/changelog.txt b/plugins/dexela/changelog.txt
index ea92265..7b2d81b 100644
--- a/plugins/dexela/changelog.txt
+++ b/plugins/dexela/changelog.txt
@@ -1,3 +1,6 @@
+* Mon May 18 2015 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.4.0-1
+- Update to libuca 2.0.0
+- Report errors opening the detector instead of crashing
* Tue Mar 17 2015 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.3.3-1
- adjust the ROI depending on the binning
* Wed Oct 8 2014 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.3.2-2
diff --git a/plugins/file/CMakeLists.txt b/plugins/file/CMakeLists.txt
index 3955366..41aa81c 100644
--- a/plugins/file/CMakeLists.txt
+++ b/plugins/file/CMakeLists.txt
@@ -5,9 +5,9 @@ find_package(TIFF)
if (TIFF_FOUND)
set(UCA_CAMERA_NAME "file")
- set(PLUGIN_VERSION "0.0.1")
- set(PLUGIN_REVISION "0")
- set(PLUGIN_REQUIRES "libuca >= 1.2.0")
+ set(PLUGIN_VERSION "0.0.2")
+ set(PLUGIN_REVISION "1")
+ set(PLUGIN_REQUIRES "libuca >= 2.0.0")
set(PLUGIN_SUMMARY "File plugin for libuca")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
diff --git a/plugins/mock/CMakeLists.txt b/plugins/mock/CMakeLists.txt
index df53b5b..a22616a 100644
--- a/plugins/mock/CMakeLists.txt
+++ b/plugins/mock/CMakeLists.txt
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.6)
project(ucamock C)
set(UCA_CAMERA_NAME "mock")
-set(PLUGIN_VERSION "1.0.1")
+set(PLUGIN_VERSION "1.0.2")
set(PLUGIN_REVISION "1")
-set(PLUGIN_REQUIRES "libuca >= 1.2.0")
+set(PLUGIN_REQUIRES "libuca >= 2.0.0")
set(PLUGIN_SUMMARY "Mock plugin for libuca")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
diff --git a/plugins/pco/CMakeLists.txt b/plugins/pco/CMakeLists.txt
index 04c2e16..e4cdcf4 100644
--- a/plugins/pco/CMakeLists.txt
+++ b/plugins/pco/CMakeLists.txt
@@ -7,9 +7,9 @@ find_package(ClSerSis)
if (PCO_FOUND)
set(UCA_CAMERA_NAME "pco")
- set(PLUGIN_VERSION "1.2.0")
+ set(PLUGIN_VERSION "1.2.1")
set(PLUGIN_REVISION "1")
- set(PLUGIN_REQUIRES "libuca >= 1.5.0")
+ set(PLUGIN_REQUIRES "libuca >= 2.0.0")
set(PLUGIN_SUMMARY "libpco plugin for libuca")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
diff --git a/plugins/pf/CMakeLists.txt b/plugins/pf/CMakeLists.txt
index 157c862..92be416 100644
--- a/plugins/pf/CMakeLists.txt
+++ b/plugins/pf/CMakeLists.txt
@@ -7,9 +7,9 @@ find_package(ClSerMe4)
if (PF_FOUND AND CLSERME4_FOUND AND FGLIB5_FOUND)
set(UCA_CAMERA_NAME "pco")
- set(PLUGIN_VERSION "1.0.0")
+ set(PLUGIN_VERSION "1.0.1")
set(PLUGIN_REVISION "1")
- set(PLUGIN_REQUIRES "libuca >= 1.2.0")
+ set(PLUGIN_REQUIRES "libuca >= 2.0.0")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh)
diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt
index 69f668d..e2ace6b 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.3.0")
+set(VERSION "1.4.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.5.0")
+ set(PLUGIN_REQUIRES "libuca >= 2.0.0, libpyloncam >= 0.5.0")
set(PLUGIN_VENDOR "ANKA Computing Group")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
diff --git a/plugins/pylon/changelog.txt b/plugins/pylon/changelog.txt
index 7ce5fa8..ea5e9be 100644
--- a/plugins/pylon/changelog.txt
+++ b/plugins/pylon/changelog.txt
@@ -1,3 +1,7 @@
+* Mon May 18 2015 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.4.0-1
+- Update to libuca 2.0.0
+* Wed Oct 8 2014 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.3.0-2
+- new revision for libuca 1.6.0
* Tue Oct 7 2014 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.3.0-1
- require libpyloncam 0.5.0 because of new auto exposure feature
* Thu Sep 11 2014 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.2.1-1
diff --git a/plugins/ufo/CMakeLists.txt b/plugins/ufo/CMakeLists.txt
index c5189b2..5872469 100644
--- a/plugins/ufo/CMakeLists.txt
+++ b/plugins/ufo/CMakeLists.txt
@@ -5,9 +5,9 @@ find_package(IPE)
if (IPE_FOUND)
set(UCA_CAMERA_NAME "ufo")
- set(PLUGIN_VERSION "1.0.1")
+ set(PLUGIN_VERSION "1.0.2")
set(PLUGIN_REVISION "1")
- set(PLUGIN_REQUIRES "libuca >= 1.2.0")
+ set(PLUGIN_REQUIRES "libuca >= 2.0.0")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh)