diff options
| author | Mihael Koep <koep@schneide.com> | 2013-04-23 17:56:25 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-11-06 14:43:09 +0100 |
| commit | 16d9c31f754a99ce6dc7e6de2c7da8a9468d7f89 (patch) | |
| tree | 090702530ec1dfba1af4d1b760d8590b1d1d7d86 | |
| parent | 35522c2f2606a51605356d9edfa9635442b22c3a (diff) | |
| download | uca-16d9c31f754a99ce6dc7e6de2c7da8a9468d7f89.tar.gz uca-16d9c31f754a99ce6dc7e6de2c7da8a9468d7f89.tar.bz2 uca-16d9c31f754a99ce6dc7e6de2c7da8a9468d7f89.tar.xz uca-16d9c31f754a99ce6dc7e6de2c7da8a9468d7f89.zip | |
Fix pylon discovery.
| -rw-r--r-- | cmake/FindPylon.cmake | 2 | ||||
| -rw-r--r-- | plugins/pylon/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cmake/FindPylon.cmake b/cmake/FindPylon.cmake index a77e613..d3f8879 100644 --- a/cmake/FindPylon.cmake +++ b/cmake/FindPylon.cmake @@ -16,6 +16,7 @@ if (NOT "$ENV{PYLON_ROOT}" STREQUAL "") find_library(YAT_LIB yat ${YAT_LIBRARY_DIRS}) pkg_check_modules(LIBPYLONCAM pyloncam>=0.1) + if (DEFINED LIBPYLONCAM_OTHER_PREFIX) string(REPLACE ${LIBPYLONCAM_PREFIX} ${LIBPYLONCAM_OTHER_PREFIX} LIBPYLONCAM_INCLUDEDIR ${LIBPYLONCAM_INCLUDEDIR}) @@ -33,3 +34,4 @@ if (NOT "$ENV{PYLON_ROOT}" STREQUAL "") LIBPYLONCAM_LIBRARIES LIBPYLONCAM_LIBDIR) endif() +message("-- Pylon libraries found: ${PYLON_FOUND}") diff --git a/plugins/pylon/CMakeLists.txt b/plugins/pylon/CMakeLists.txt index 2e9dde9..f45ef76 100644 --- a/plugins/pylon/CMakeLists.txt +++ b/plugins/pylon/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 2.6) project(ucapylon C) +find_package(Pylon) if (PYLON_FOUND) set(UCA_CAMERA_NAME "pylon") |