From 16d9c31f754a99ce6dc7e6de2c7da8a9468d7f89 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 23 Apr 2013 17:56:25 +0200 Subject: Fix pylon discovery. --- cmake/FindPylon.cmake | 2 ++ plugins/pylon/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+) 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") -- cgit v1.2.3