diff options
| author | Volker Kaiser <volker.kaiser@softwareschneiderei.de> | 2012-08-02 10:34:23 +0200 |
|---|---|---|
| committer | Volker Kaiser <volker.kaiser@softwareschneiderei.de> | 2012-08-02 10:34:23 +0200 |
| commit | a48438344b1e36588ded72a2bb3ca5c309c3d656 (patch) | |
| tree | 1e6b2ba43f3114d979109a0e4bfce89f49852bb4 | |
| parent | c22c7e1254228c43cc56eecb03bd6ac171768a0d (diff) | |
| download | uca-a48438344b1e36588ded72a2bb3ca5c309c3d656.tar.gz uca-a48438344b1e36588ded72a2bb3ca5c309c3d656.tar.bz2 uca-a48438344b1e36588ded72a2bb3ca5c309c3d656.tar.xz uca-a48438344b1e36588ded72a2bb3ca5c309c3d656.zip | |
enhanced usage of LIBPYLONCAM_OTHER_PREFIX
| -rw-r--r-- | cmake/FindPylon.cmake | 18 |
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() |