diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2014-02-16 17:39:32 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2014-02-16 17:39:32 +0100 |
| commit | a923f06609ef600af2c3819d3a2bd8e770a95652 (patch) | |
| tree | cef1d5ea33186646c9576772cec4315ca4aae0bb | |
| parent | ab11ba963979fe96e5e987701b6468cb1c996554 (diff) | |
| download | ufo-filters-a923f06609ef600af2c3819d3a2bd8e770a95652.tar.gz ufo-filters-a923f06609ef600af2c3819d3a2bd8e770a95652.tar.bz2 ufo-filters-a923f06609ef600af2c3819d3a2bd8e770a95652.tar.xz ufo-filters-a923f06609ef600af2c3819d3a2bd8e770a95652.zip | |
Fix building with local ufo installation
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/scangobj.sh.in | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9329b88..7b37f62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,8 @@ endif () find_package(OpenCL REQUIRED) find_package(PkgConfig REQUIRED) pkg_check_modules(UFO ufo>=${PKG_UFO_CORE_MIN_REQUIRED} REQUIRED) + +link_directories(${UFO_LIBRARY_DIRS}) #}}} #{{{ Global definitions add_definitions("-std=c99 -pedantic -Wall -Wextra -fPIC") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff6a448..8591ab3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -61,18 +61,21 @@ if (TIFF_FOUND) list(APPEND ufofilter_SRCS ufo-writer-task.c) list(APPEND ufofilter_LIBS ${TIFF_LIBRARIES}) include_directories(${TIFF_INCLUDE_DIRS}) + link_directories(${TIFF_LIBRARY_DIRS}) endif () if (UCA_INCLUDE_DIRS AND UCA_LIBRARIES) list(APPEND ufofilter_SRCS ufo-camera-task.c) list(APPEND ufofilter_LIBS ${UCA_LIBRARIES}) include_directories(${UCA_INCLUDE_DIRS}) + link_directories(${UCA_LIBRARY_DIRS}) endif () if (OCLFFT_FOUND) set(HAVE_OCLFFT "1") set(ufofilter_LIBS ${ufofilter_LIBS} ${OCLFFT_LIBRARIES}) include_directories(${OCLFFT_INCLUDE_DIRS}) + link_directories(${OCLFFT_LIBRARY_DIRS}) endif () # #if (FFTW3_FOUND) diff --git a/src/scangobj.sh.in b/src/scangobj.sh.in index eb62be4..e14f2ef 100644 --- a/src/scangobj.sh.in +++ b/src/scangobj.sh.in @@ -1,4 +1,4 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${CMAKE_CURRENT_BINARY_DIR}" -export LDFLAGS="${GTK_DOC_LDFLAGS} ${shared_objects} -L${CMAKE_CURRENT_BINARY_DIR}" +export LDFLAGS="${GTK_DOC_LDFLAGS} ${shared_objects} -L${CMAKE_CURRENT_BINARY_DIR} -L${UFO_LIBRARY_DIRS}" export CFLAGS="${GTK_DOC_CFLAGS}" gtkdoc-scangobj --module=UfoFilters |