FindFFTW: Keep checking pkg_config until fftw is found
authorRoland Schulz <roland@utk.edu>
Wed, 14 Nov 2012 18:54:12 +0000 (13:54 -0500)
committerRoland Schulz <roland@utk.edu>
Wed, 14 Nov 2012 18:54:12 +0000 (13:54 -0500)
Prior pkg_config didn't work when PKG_CONFIG_PATH was changed
after initial cmake run.

Change-Id: I7c067bdb634577c7847421f187b4893aa52ff511

cmake/FindFFTW.cmake

index 66d093eea369a3454744c5cde6ca4c4b1a4a37f0..d233df14ace03568a290b11b13db5aa345f65565 100644 (file)
@@ -36,9 +36,9 @@ else()
 endif()
 
 find_package(PkgConfig)
-if(NOT __pkg_config_checked_PC_${FFTW})
+if(NOT __pkg_config_checked_PC_${FFTW} OR NOT ${FFTW}_LIBRARY)
   pkg_check_modules(PC_${FFTW} "${${FFTW}_PKG}")
-endif(NOT __pkg_config_checked_PC_${FFTW})
+endif(NOT __pkg_config_checked_PC_${FFTW} OR NOT ${FFTW}_LIBRARY)
 
 find_path(${FFTW}_INCLUDE_DIR "fftw3.h" HINTS ${PC_${FFTW}_INCLUDE_DIRS})
 find_library(${FFTW}_LIBRARY NAMES "${${FFTW}_PKG}" HINTS ${PC_${FFTW}_LIBRARY_DIRS})