summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2016-11-06 18:33:34 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2016-11-06 18:33:34 +0100
commit441744459968fbf856493158a707f061e6d5689e (patch)
tree6bc52f9bba773dd95083f305817a6e61a45c70f2
parent3ed7b5043fb5ae1862775d37d617af87ad3f9102 (diff)
downloadufo-filters-441744459968fbf856493158a707f061e6d5689e.tar.gz
ufo-filters-441744459968fbf856493158a707f061e6d5689e.tar.bz2
ufo-filters-441744459968fbf856493158a707f061e6d5689e.tar.xz
ufo-filters-441744459968fbf856493158a707f061e6d5689e.zip
Do not link oclfft unconditionally
-rw-r--r--CMakeLists.txt1
-rw-r--r--src/CMakeLists.txt4
2 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b39a6fa..549c9fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
if (CMAKE_COMPILER_IS_GNUCC OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
add_definitions("-Wno-unused-parameter")
endif ()
-
#}}}
#{{{ Subdirectories
add_subdirectory(docs)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1f9f285..11166f6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -106,8 +106,7 @@ file(GLOB ufofilter_KERNELS "kernels/*.cl")
#}}}
#{{{ Variables
set(ufofilter_LIBS
- ${UFO_LIBRARIES}
- oclfft)
+ ${UFO_LIBRARIES})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -pedantic -Wall -Wextra -fPIC -Wno-unused-parameter -Wno-deprecated-declarations")
@@ -194,6 +193,7 @@ if (CLFFT_FOUND)
list(APPEND ufofilter_LIBS ${CLFFT_LIBRARIES})
set(HAVE_AMD ON)
else ()
+ list(APPEND ufofilter_LIBS oclfft)
set(HAVE_AMD OFF)
endif ()
endif ()