summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rwxr-xr-xtests/autotrigger.sh13
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"