diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2015-04-28 21:16:02 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2015-04-28 21:16:02 +0200 |
| commit | 5a85d83e3e099c5781c205b62fecd25474f0985a (patch) | |
| tree | 8885d89e1f6ea2547f767eb7b2498eca916aac5c | |
| parent | e1265fa32837f457ee2c2fa259d12c9545af4bbf (diff) | |
| download | ipecamera-5a85d83e3e099c5781c205b62fecd25474f0985a.tar.gz ipecamera-5a85d83e3e099c5781c205b62fecd25474f0985a.tar.bz2 ipecamera-5a85d83e3e099c5781c205b62fecd25474f0985a.tar.xz ipecamera-5a85d83e3e099c5781c205b62fecd25474f0985a.zip | |
Link against ufodecode
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | tests/autotrigger.sh | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f8ccdc2..65db8c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ set(HEADERS ${HEADERS} model.h cmosis.h base.h reader.h events.h data.h private. add_library(ipecamera SHARED model.c cmosis.c base.c reader.c events.c data.c) -target_link_libraries(ipecamera ${PCILIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(ipecamera ${PCILIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${UFODECODE_LIBRARIES} ) install(FILES ipecamera.h DESTINATION include diff --git a/tests/autotrigger.sh b/tests/autotrigger.sh index b7318c8..678f854 100755 --- a/tests/autotrigger.sh +++ b/tests/autotrigger.sh @@ -1,9 +1,16 @@ #! /bin/bash function pci { - PCILIB_PATH=`which pci` - #LD_LIBRARY_PATH="$PCILIB_PATH" - $PCILIB_PATH/pci $* + APP_PATH=`dirname $0`/.. + if [ -d $APP_PATH/../pcitool ]; then + PCILIB_BINARY="$APP_PATH/../pcitool/pcitool/pci" + PCILIB_PATH="$APP_PATH/../pcitool/pcilib" + else + PCILIB_BINARY=`which pci` + PCILIB_PATH="" + fi + + LD_LIBRARY_PATH="$PCILIB_PATH" PCILIB_PLUGIN_DIR="$APP_PATH" $PCILIB_BINARY $* } echo "Starting the grabber" |