From d0a3191ef899bf51d4bc7f89ea7967cce4bc5a82 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Fri, 11 Dec 2015 08:35:40 +0100 Subject: Find AMD clFFT using pkg-config --- common/cmake/FindclFFT.cmake | 61 -------------------------------------------- src/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 common/cmake/FindclFFT.cmake diff --git a/common/cmake/FindclFFT.cmake b/common/cmake/FindclFFT.cmake deleted file mode 100644 index 92dcc82..0000000 --- a/common/cmake/FindclFFT.cmake +++ /dev/null @@ -1,61 +0,0 @@ -# - Find clFFT, AMD's OpenCL FFT library - -# This script defines the following variables: -# CLFFT_INCLUDE_DIRS - Location of clFFT's include directory. -# CLFFT_LIBRARIES - Location of clFFT's libraries -# CLFFT_FOUND - True if clFFT has been located -# -# If your clFFT installation is not in a standard installation directory, you -# may provide a hint to where it may be found. Simply set the value CLFFT_ROOT -# to the directory containing 'include/clFFT.h" prior to calling this script. -# -# By default this script will attempt to find the 32-bit version of clFFT. -# If you desire to use the 64-bit version instead, set -# set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON) -# prior to calling this script. -# -#============================================================================= -# Copyright 2014 Brian Kloppenborg -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -IF(CLFFT_INCLUDE_DIRS) - # Already in cache, be silent - set (CLFFT_FIND_QUIETLY TRUE) -ENDIF (CLFFT_INCLUDE_DIRS) - -FIND_PATH(CLFFT_ROOT_DIR - NAMES include/clFFT.h - HINTS /usr/local/ ${CLFFT_ROOT} - DOC "clFFT root directory.") - -FIND_PATH(_CLFFT_INCLUDE_DIRS - NAMES clFFT.h - HINTS ${CLFFT_ROOT_DIR}/include - DOC "clFFT Include directory") - -FIND_LIBRARY(_CLFFT_LIBRARY - NAMES clFFT - HINTS ${CLFFT_ROOT_DIR}/lib) - -SET(CLFFT_INCLUDE_DIRS ${_CLFFT_INCLUDE_DIRS}) -SET(CLFFT_LIBRARIES ${_CLFFT_LIBRARY}) - -# handle the QUIETLY and REQUIRED arguments and set CLFFT_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE (FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(CLFFT DEFAULT_MSG CLFFT_LIBRARIES CLFFT_INCLUDE_DIRS) -MARK_AS_ADVANCED(CLFFT_LIBRARIES CLFFT_INCLUDE_DIRS) - - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 79172a2..b39a977 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -101,7 +101,6 @@ endif() #}}} #{{{ Dependency checks find_package(TIFF) -find_package(clFFT) find_package(HDF5 1.8) find_package(JPEG) @@ -109,6 +108,7 @@ pkg_check_modules(UCA libuca>=1.2) pkg_check_modules(OPENCV opencv) pkg_check_modules(LIBTIFF4 libtiff-4>=4.0.0) pkg_check_modules(GSL gsl) +pkg_check_modules(CLFFT clFFT) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp") -- cgit v1.2.3