summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--deps/oclfft/CMakeLists.txt2
2 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37373ca..bf3c601 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,11 +24,9 @@ set(UFO_DESCRIPTION_SUMMARY "UFO good filters")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/common/cmake")
#{{{ Variables and Options
-include(ConfigurePaths)
+include(GNUInstallDirs)
include(PkgConfigVars)
-configure_paths(UFO_FILTERS)
-
set(PKG_UFO_CORE_MIN_REQUIRED "0.6")
# Backprojection burst mode, must be one of 1, 2, 4, 8, 16
set(BP_BURST "16" CACHE STRING "Number of projections processed in one pass")
diff --git a/deps/oclfft/CMakeLists.txt b/deps/oclfft/CMakeLists.txt
index 6743013..f3a1c41 100644
--- a/deps/oclfft/CMakeLists.txt
+++ b/deps/oclfft/CMakeLists.txt
@@ -10,4 +10,4 @@ add_library(oclfft SHARED
target_link_libraries(oclfft ${UFO_LIBRARIES} ${OpenCL_LIBRARIES})
install(TARGETS oclfft
- LIBRARY DESTINATION ${UFO_FILTERS_LIBDIR})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})