diff options
| author | Mihael Koep <koep@schneide.com> | 2012-10-19 17:03:49 +0200 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2012-10-19 17:03:49 +0200 |
| commit | 9866002f3f569f6da886d71964d3298183cd1646 (patch) | |
| tree | 968097e2f5fa11a094238ead6469739a725d8ce2 /cmake | |
| parent | 37f48ae1b67b1205ba4884ec350afdf5ab7dd2d3 (diff) | |
| parent | 6f12303cf4c4130d544c30f8ad5e2445a1fa3e61 (diff) | |
| download | uca-9866002f3f569f6da886d71964d3298183cd1646.tar.gz uca-9866002f3f569f6da886d71964d3298183cd1646.tar.bz2 uca-9866002f3f569f6da886d71964d3298183cd1646.tar.xz uca-9866002f3f569f6da886d71964d3298183cd1646.zip | |
Merge remote branch 'origin/master' into dexela
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
src/uca-camera.c
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindClSerMe4.cmake | 2 | ||||
| -rw-r--r-- | cmake/FindFgLib5.cmake | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/cmake/FindClSerMe4.cmake b/cmake/FindClSerMe4.cmake index 2251c9a..803b620 100644 --- a/cmake/FindClSerMe4.cmake +++ b/cmake/FindClSerMe4.cmake @@ -13,6 +13,7 @@ FIND_PATH(CLSERME4_INCLUDE_DIR clser.h ${SISODIR4}/include ${SISODIRME4}/include ${CMAKE_INSTALL_PREFIX}/include + "/opt/siso/include" ) INCLUDE(SisoLibDir) @@ -26,6 +27,7 @@ FIND_LIBRARY(CLSERME4_LIBRARY NAMES clserme4 clsersisome4 $ENV{CLSERME4} ${LIB_DIRS} ${CMAKE_INSTALL_PREFIX}/lib + "/opt/siso/lib" ) IF(CLSERME4_INCLUDE_DIR AND CLSERME4_LIBRARY) diff --git a/cmake/FindFgLib5.cmake b/cmake/FindFgLib5.cmake index cba0002..3f6a0c1 100644 --- a/cmake/FindFgLib5.cmake +++ b/cmake/FindFgLib5.cmake @@ -10,6 +10,7 @@ FIND_PATH(FGLIB5_INCLUDE_DIR fgrab_define.h "${CMAKE_INSTALL_PREFIX}/include" "${SISODIR5}/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Silicon Software GmbH\\Runtime5;Info]/include" + "/opt/siso/include" ) INCLUDE(SisoLibDir) @@ -23,6 +24,7 @@ FIND_LIBRARY(FGLIB5_LIBRARY NAMES fglib5 ${LIB_DIRS} "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Silicon Software GmbH\\Runtime5;Info]/lib/${COMPILER_LIB_DIR}" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Silicon Software GmbH\\Runtime5;Info]/lib" + "/opt/siso/lib" ) IF(FGLIB5_INCLUDE_DIR AND FGLIB5_LIBRARY) |