diff options
| author | Mihael Koep <koep@schneide.com> | 2012-10-19 16:08:05 +0200 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2012-10-19 16:08:05 +0200 |
| commit | 420839db21e0bb60f6be72f1924af74b0ffe8224 (patch) | |
| tree | 92b5d777f2d52d46da92b9e3793eab05d13f7d4f /cmake | |
| parent | b73c7a9550a39566b881244d95cd0cb2a97e82b3 (diff) | |
| parent | ee6b7a941f7ef7cdcc92c04b80a683d7370f52bd (diff) | |
| download | libuca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.gz libuca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.bz2 libuca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.xz libuca-420839db21e0bb60f6be72f1924af74b0ffe8224.zip | |
Merge remote branch 'origin/1.0' into dexela
Conflicts:
CMakeLists.txt
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindPylon.cmake | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/cmake/FindPylon.cmake b/cmake/FindPylon.cmake index 01cee02..a77e613 100644 --- a/cmake/FindPylon.cmake +++ b/cmake/FindPylon.cmake @@ -13,8 +13,6 @@ find_package(PkgConfig) find_package(PackageHandleStandardArgs) if (NOT "$ENV{PYLON_ROOT}" STREQUAL "") - message("PYLON_ROOT=$ENV{PYLON_ROOT}") - find_library(YAT_LIB yat ${YAT_LIBRARY_DIRS}) pkg_check_modules(LIBPYLONCAM pyloncam>=0.1) @@ -34,7 +32,4 @@ if (NOT "$ENV{PYLON_ROOT}" STREQUAL "") LIBPYLONCAM_INCLUDEDIR LIBPYLONCAM_LIBRARIES LIBPYLONCAM_LIBDIR) - -else() - message("Environment variable PYLON_ROOT not found! => unable to build pylon camera support") endif() |