diff options
| author | Mihael Koep <koep@schneide.com> | 2015-05-18 17:05:08 +0200 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2015-05-18 17:26:53 +0200 |
| commit | 2f3f57cf90e31b9459de3f36824668ec3a51a177 (patch) | |
| tree | 94266aff8a79a0fdf9150dab2297f70f85299be4 /plugins/pylon | |
| parent | f2436c659242ccf0d5bb30a59b81cef8ee0aae99 (diff) | |
| download | uca-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
Diffstat (limited to 'plugins/pylon')
| -rw-r--r-- | plugins/pylon/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | plugins/pylon/changelog.txt | 4 |
2 files changed, 6 insertions, 2 deletions
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 |