From 9fa5eb803ea00ae42ab7a0c20329d3557a48e192 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Mon, 18 May 2015 16:41:28 +0200 Subject: Improve error handling on dexela camera initialisation Conflicts: plugins/dexela/CMakeLists.txt plugins/dexela/changelog.txt --- plugins/dexela/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/dexela/CMakeLists.txt') diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt index c9edd54..a62ee76 100644 --- a/plugins/dexela/CMakeLists.txt +++ b/plugins/dexela/CMakeLists.txt @@ -11,7 +11,7 @@ if (DEXELA_FOUND) set(PLUGIN_SUMMARY "Dexela plugin for libuca") set(PLUGIN_CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt") set(PLUGIN_DESCRIPTION "Plugin for the Dexela 1207 detector.") - set(PLUGIN_REQUIRES "libuca >= 1.3.0, libdexela >= 1.1.0") + set(PLUGIN_REQUIRES "libuca >= 2.0.0, libdexela >= 1.2.0") set(PLUGIN_VENDOR "ANKA Computing Group") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in -- cgit v1.2.3 From f2436c659242ccf0d5bb30a59b81cef8ee0aae99 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 17 Mar 2015 11:22:18 +0100 Subject: Correct the ROI dimensions respecting the binning mode Conflicts: plugins/dexela/changelog.txt --- plugins/dexela/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/dexela/CMakeLists.txt') diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt index a62ee76..ba1ec2b 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.2") +set(VERSION "1.3.3") find_package(DEXELA) -- cgit v1.2.3 From 2f3f57cf90e31b9459de3f36824668ec3a51a177 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Mon, 18 May 2015 17:05:08 +0200 Subject: Camera plugins now require libuca >= 2.0 so update their versions too Conflicts: plugins/dexela/CMakeLists.txt plugins/dexela/changelog.txt --- plugins/dexela/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/dexela/CMakeLists.txt') 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) -- cgit v1.2.3