summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake')
-rw-r--r--cmake/FindPylon.cmake18
1 files changed, 7 insertions, 11 deletions
diff --git a/cmake/FindPylon.cmake b/cmake/FindPylon.cmake
index a8b7182..fc9624b 100644
--- a/cmake/FindPylon.cmake
+++ b/cmake/FindPylon.cmake
@@ -14,20 +14,10 @@ find_package(PackageHandleStandardArgs)
if (NOT "$ENV{PYLON_ROOT}" STREQUAL "")
message("PYLON_ROOT=$ENV{PYLON_ROOT}")
- set(ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:$ENV{PYLON_ROOT}/lib")
- set(ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH};$ENV{PYLON_ROOT}/lib64")
- set(ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH};$ENV{PYLON_ROOT}/genicam/bin/Linux64_x64")
- set(ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH};$ENV{PYLON_ROOT}/genicam/bin/Linux32_i86")
-
- pkg_check_modules(LIBPYLONCAM pyloncam>=0.1 REQUIRED)
find_library(YAT_LIB yat ${YAT_LIBRARY_DIRS})
- find_package_handle_standard_args(PYLON DEFAULT_MSG LIBPYLONCAM_INCLUDEDIR LIBPYLONCAM_LIBRARIES)
-
- mark_as_advanced(
- LIBPYLONCAM_INCLUDEDIR
- LIBPYLONCAM_LIBRARIES)
+ pkg_check_modules(LIBPYLONCAM pyloncam>=0.1 REQUIRED)
if (DEFINED LIBPYLONCAM_OTHER_PREFIX)
string(REPLACE ${LIBPYLONCAM_PREFIX} ${LIBPYLONCAM_OTHER_PREFIX}
LIBPYLONCAM_INCLUDEDIR ${LIBPYLONCAM_INCLUDEDIR})
@@ -35,6 +25,12 @@ if (NOT "$ENV{PYLON_ROOT}" STREQUAL "")
LIBPYLONCAM_LIBRARIES ${LIBPYLONCAM_LIBRARIES})
endif()
+ find_package_handle_standard_args(PYLON DEFAULT_MSG LIBPYLONCAM_INCLUDEDIR LIBPYLONCAM_LIBRARIES)
+
+ mark_as_advanced(
+ LIBPYLONCAM_INCLUDEDIR
+ LIBPYLONCAM_LIBRARIES)
+
else()
message("Environment variable PYLON_ROOT not found! => unable to build pylon camera support")
endif()