diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2014-10-07 13:58:44 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2014-10-07 13:58:44 +0200 |
| commit | f1198fac7cb7e0817fe11cacdc0a314aa45536f2 (patch) | |
| tree | 9f9df906cf7b2155804f2f5107f7c6dc09d15a47 /plugins/pylon/CMakeLists.txt | |
| parent | 0570957a002d6f660a17135cc136a053018035c6 (diff) | |
| parent | efb97e000e66125453f3f07caa74b324a3205a4a (diff) | |
| download | uca-f1198fac7cb7e0817fe11cacdc0a314aa45536f2.tar.gz uca-f1198fac7cb7e0817fe11cacdc0a314aa45536f2.tar.bz2 uca-f1198fac7cb7e0817fe11cacdc0a314aa45536f2.tar.xz uca-f1198fac7cb7e0817fe11cacdc0a314aa45536f2.zip | |
Merge pull request #59 from miq/plugin-pylon-improvements
Plugin pylon improvements
Diffstat (limited to 'plugins/pylon/CMakeLists.txt')
| -rw-r--r-- | plugins/pylon/CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt index 5864b84..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.1.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.3.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 @@ -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} |