summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Kaiser <volker.kaiser@softwareschneiderei.de>2012-08-02 11:44:17 +0200
committerVolker Kaiser <volker.kaiser@softwareschneiderei.de>2012-08-02 11:44:17 +0200
commit91daa3bdebd1fc1e368ff9fa2e99b4ea1131361e (patch)
treef7703efc5b42e2c44ac50544d45d8b5bb18b9691
parenta48438344b1e36588ded72a2bb3ca5c309c3d656 (diff)
downloaduca-91daa3bdebd1fc1e368ff9fa2e99b4ea1131361e.tar.gz
uca-91daa3bdebd1fc1e368ff9fa2e99b4ea1131361e.tar.bz2
uca-91daa3bdebd1fc1e368ff9fa2e99b4ea1131361e.tar.xz
uca-91daa3bdebd1fc1e368ff9fa2e99b4ea1131361e.zip
using LIBDIR
-rw-r--r--cmake/FindPylon.cmake5
-rw-r--r--src/CMakeLists.txt1
2 files changed, 5 insertions, 1 deletions
diff --git a/cmake/FindPylon.cmake b/cmake/FindPylon.cmake
index fc9624b..c1a4af1 100644
--- a/cmake/FindPylon.cmake
+++ b/cmake/FindPylon.cmake
@@ -23,13 +23,16 @@ if (NOT "$ENV{PYLON_ROOT}" STREQUAL "")
LIBPYLONCAM_INCLUDEDIR ${LIBPYLONCAM_INCLUDEDIR})
string(REPLACE ${LIBPYLONCAM_PREFIX} ${LIBPYLONCAM_OTHER_PREFIX}
LIBPYLONCAM_LIBRARIES ${LIBPYLONCAM_LIBRARIES})
+ string(REPLACE ${LIBPYLONCAM_PREFIX} ${LIBPYLONCAM_OTHER_PREFIX}
+ LIBPYLONCAM_LIBDIR ${LIBPYLONCAM_LIBDIR})
endif()
find_package_handle_standard_args(PYLON DEFAULT_MSG LIBPYLONCAM_INCLUDEDIR LIBPYLONCAM_LIBRARIES)
mark_as_advanced(
LIBPYLONCAM_INCLUDEDIR
- LIBPYLONCAM_LIBRARIES)
+ LIBPYLONCAM_LIBRARIES
+ LIBPYLONCAM_LIBDIR)
else()
message("Environment variable PYLON_ROOT not found! => unable to build pylon camera support")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9238106..acba8a4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -101,6 +101,7 @@ if (PYLON_FOUND)
set(uca_LIBS ${uca_LIBS} ${LIBPYLONCAM_LIBRARIES})
include_directories(${LIBPYLONCAM_INCLUDEDIR})
+ link_directories(${LIBPYLONCAM_LIBDIR})
endif()
endif()