From af2224f96274d2c766ac630adf1f4ff034fcae6e Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Tue, 16 Mar 2010 09:27:26 +0000
Subject: [PATCH] Bug 1310: FindXXX macros now use HINTS instead of PATHS for
XXX_ROOT_DIR. This way, XXX_ROOT_DIR is always searched *before* the system
paths.
---
CMake/FindCFITSIO.cmake | 4 ++--
CMake/FindCPPLapack.cmake | 2 +-
CMake/FindCasacore.cmake | 4 ++--
CMake/FindFFTW2.cmake | 4 ++--
CMake/FindFFTW3.cmake | 4 ++--
CMake/FindLog4Cplus.cmake | 4 ++--
CMake/FindLog4Cxx.cmake | 4 ++--
CMake/FindMASS.cmake | 6 +++---
CMake/FindPQXX.cmake | 6 +++---
CMake/FindPVSS.cmake | 6 +++---
CMake/FindPyrap.cmake | 4 ++--
CMake/FindReadline.cmake | 4 ++--
CMake/FindValgrind.cmake | 2 +-
CMake/FindWCSLIB.cmake | 4 ++--
14 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/CMake/FindCFITSIO.cmake b/CMake/FindCFITSIO.cmake
index e0e4d67de29..85c26039240 100644
--- a/CMake/FindCFITSIO.cmake
+++ b/CMake/FindCFITSIO.cmake
@@ -33,9 +33,9 @@
if(NOT CFITSIO_FOUND)
find_path(CFITSIO_INCLUDE_DIR fitsio.h
- PATHS ${CFITSIO_ROOT_DIR} PATH_SUFFIXES include)
+ HINTS ${CFITSIO_ROOT_DIR} PATH_SUFFIXES include)
find_library(CFITSIO_LIBRARY cfitsio
- PATHS ${CFITSIO_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${CFITSIO_ROOT_DIR} PATH_SUFFIXES lib)
find_library(M_LIBRARY m)
mark_as_advanced(CFITSIO_INCLUDE_DIR CFITSIO_LIBRARY M_LIBRARY)
diff --git a/CMake/FindCPPLapack.cmake b/CMake/FindCPPLapack.cmake
index dadf67cd96a..d46adf56be8 100644
--- a/CMake/FindCPPLapack.cmake
+++ b/CMake/FindCPPLapack.cmake
@@ -31,7 +31,7 @@
if(NOT CPPLAPACK_FOUND)
find_path(CPPLAPACK_INCLUDE_DIR cpplapack.h
- PATHS ${CPPLAPACK_ROOT_DIR} PATH_SUFFIXES include)
+ HINTS ${CPPLAPACK_ROOT_DIR} PATH_SUFFIXES include)
mark_as_advanced(CPPLAPACK_INCLUDE_DIR)
if(CPPLAPACK_FIND_REQUIRED)
diff --git a/CMake/FindCasacore.cmake b/CMake/FindCasacore.cmake
index 9fe17a69f16..8db8f2c84cf 100644
--- a/CMake/FindCasacore.cmake
+++ b/CMake/FindCasacore.cmake
@@ -107,7 +107,7 @@ endmacro(casacore_resolve_dependencies _result)
macro(casacore_find_library _name)
string(TOUPPER ${_name} _NAME)
find_library(${_NAME}_LIBRARY ${_name}
- PATHS ${CASACORE_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${CASACORE_ROOT_DIR} PATH_SUFFIXES lib)
mark_as_advanced(${_NAME}_LIBRARY)
if(${_NAME}_LIBRARY)
list(APPEND CASACORE_LIBRARIES ${${_NAME}_LIBRARY})
@@ -189,7 +189,7 @@ set(CASACORE_MISSING_COMPONENTS)
# files in ${prefix}/include/casacore, instead of ${prefix}/include.
if(NOT CASACORE_INCLUDE_DIR)
find_path(CASACORE_INCLUDE_DIR casa/aips.h
- PATHS ${CASACORE_ROOT_DIR} PATH_SUFFIXES include/casacore)
+ HINTS ${CASACORE_ROOT_DIR} PATH_SUFFIXES include/casacore)
mark_as_advanced(CASACORE_INCLUDE_DIR)
endif(NOT CASACORE_INCLUDE_DIR)
diff --git a/CMake/FindFFTW2.cmake b/CMake/FindFFTW2.cmake
index ed709ff94a0..d37423a1f28 100644
--- a/CMake/FindFFTW2.cmake
+++ b/CMake/FindFFTW2.cmake
@@ -143,7 +143,7 @@ set(FFTW2_LIBRARIES)
foreach(_lib ${_libraries})
string(TOUPPER "${_lib}2" _LIB)
find_library(${_LIB}_LIBRARY NAMES ${_lib} ${_prec}${_lib}
- PATHS ${FFTW2_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${FFTW2_ROOT_DIR} PATH_SUFFIXES lib)
mark_as_advanced(${_LIB}_LIBRARY)
list(APPEND FFTW2_LIBRARIES ${${_LIB}_LIBRARY})
list(APPEND _check_list ${_LIB}_LIBRARY)
@@ -151,7 +151,7 @@ endforeach(_lib ${_libraries})
# Search for header file, with and without prefix.
find_path(FFTW2_INCLUDE_DIR NAMES ${_prec}${_headerfile} ${_headerfile}
- PATHS ${FFTW2_ROOT_DIR} PATH_SUFFIXES include)
+ HINTS ${FFTW2_ROOT_DIR} PATH_SUFFIXES include)
mark_as_advanced(FFTW2_INCLUDE_DIR)
list(APPEND _check_list FFTW2_INCLUDE_DIR)
diff --git a/CMake/FindFFTW3.cmake b/CMake/FindFFTW3.cmake
index 66cd242062a..866f5d1321e 100644
--- a/CMake/FindFFTW3.cmake
+++ b/CMake/FindFFTW3.cmake
@@ -128,7 +128,7 @@ set(_check_list)
foreach(_lib ${_libraries})
string(TOUPPER ${_lib} _LIB)
find_library(${_LIB}_LIBRARY ${_lib}
- PATHS ${FFTW3_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${FFTW3_ROOT_DIR} PATH_SUFFIXES lib)
mark_as_advanced(${_LIB}_LIBRARY)
list(APPEND FFTW3_LIBRARIES ${${_LIB}_LIBRARY})
list(APPEND _check_list ${_LIB}_LIBRARY)
@@ -136,7 +136,7 @@ endforeach(_lib ${_libraries})
# Search for the header file.
find_path(FFTW3_INCLUDE_DIR fftw3.h
- PATHS ${FFTW3_ROOT_DIR} PATH_SUFFIXES include)
+ HINTS ${FFTW3_ROOT_DIR} PATH_SUFFIXES include)
mark_as_advanced(FFTW3_INCLUDE_DIR)
list(APPEND _check_list FFTW3_INCLUDE_DIR)
diff --git a/CMake/FindLog4Cplus.cmake b/CMake/FindLog4Cplus.cmake
index 50b3931c974..b6b459bbe99 100644
--- a/CMake/FindLog4Cplus.cmake
+++ b/CMake/FindLog4Cplus.cmake
@@ -33,9 +33,9 @@
if(NOT LOG4CPLUS_FOUND)
find_path(LOG4CPLUS_INCLUDE_DIR log4cplus/logger.h
- PATHS ${LOG4CPLUS_ROOT_DIR} PATH_SUFFIXES include)
+ HINTS ${LOG4CPLUS_ROOT_DIR} PATH_SUFFIXES include)
find_library(LOG4CPLUS_LIBRARY log4cplus
- PATHS ${LOG4CPLUS_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${LOG4CPLUS_ROOT_DIR} PATH_SUFFIXES lib)
mark_as_advanced(LOG4CPLUS_INCLUDE_DIR LOG4CPLUS_LIBRARY)
include(FindPackageHandleStandardArgs)
diff --git a/CMake/FindLog4Cxx.cmake b/CMake/FindLog4Cxx.cmake
index 0c47d1401c5..14247728c20 100644
--- a/CMake/FindLog4Cxx.cmake
+++ b/CMake/FindLog4Cxx.cmake
@@ -33,9 +33,9 @@
if(NOT LOG4CXX_FOUND)
find_path(LOG4CXX_INCLUDE_DIR log4cxx/logger.h
- PATHS ${LOG4CXX_ROOT_DIR} PATH_SUFFIXES include)
+ HINTS ${LOG4CXX_ROOT_DIR} PATH_SUFFIXES include)
find_library(LOG4CXX_LIBRARY log4cxx
- PATHS ${LOG4CXX_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${LOG4CXX_ROOT_DIR} PATH_SUFFIXES lib)
mark_as_advanced(LOG4CXX_INCLUDE_DIR LOG4CXX_LIBRARY)
include(FindPackageHandleStandardArgs)
diff --git a/CMake/FindMASS.cmake b/CMake/FindMASS.cmake
index c2408d1cc32..4033960c2de 100644
--- a/CMake/FindMASS.cmake
+++ b/CMake/FindMASS.cmake
@@ -36,11 +36,11 @@
if(NOT MASS_FOUND)
find_path(MASS_INCLUDE_DIR massv.h
- PATHS ${MASS_ROOT_DIR} PATH_SUFFIXES include)
+ HINTS ${MASS_ROOT_DIR} PATH_SUFFIXES include)
find_library(MASS_LIBRARY mass
- PATHS ${MASS_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${MASS_ROOT_DIR} PATH_SUFFIXES lib)
find_library(MASSV_LIBRARY massv
- PATHS ${MASS_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${MASS_ROOT_DIR} PATH_SUFFIXES lib)
mark_as_advanced(MASS_INCLUDE_DIR MASS_LIBRARY MASSV_LIBRARY)
include(FindPackageHandleStandardArgs)
diff --git a/CMake/FindPQXX.cmake b/CMake/FindPQXX.cmake
index ebffc9697c2..d98df40217b 100644
--- a/CMake/FindPQXX.cmake
+++ b/CMake/FindPQXX.cmake
@@ -34,11 +34,11 @@
if(NOT PQXX_FOUND)
find_path(PQXX_INCLUDE_DIR pqxx/pqxx
- PATHS ${PQXX_ROOT_DIR} PATH_SUFFIXES include)
+ HINTS ${PQXX_ROOT_DIR} PATH_SUFFIXES include)
find_library(PQXX_LIBRARY pqxx
- PATHS ${PQXX_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${PQXX_ROOT_DIR} PATH_SUFFIXES lib)
find_library(PQ_LIBRARY pq
- PATHS ${PQ_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${PQ_ROOT_DIR} PATH_SUFFIXES lib)
mark_as_advanced(PQXX_INCLUDE_DIR PQXX_LIBRARY PQ_LIBRARY)
include(FindPackageHandleStandardArgs)
diff --git a/CMake/FindPVSS.cmake b/CMake/FindPVSS.cmake
index 37e00e3ae79..806344d1192 100644
--- a/CMake/FindPVSS.cmake
+++ b/CMake/FindPVSS.cmake
@@ -72,7 +72,7 @@ if(NOT PVSS_FOUND)
# Use hard-coded value if version information file cannot be found.
find_file(PVSS_VERSINFO_MK
NAMES VersInfo.mk
- PATHS ${PVSS_ROOT_DIR}
+ HINTS ${PVSS_ROOT_DIR}
PATH_SUFFIXES api)
mark_as_advanced(PVSS_VERSINFO_MK)
if(NOT PVSS_VERSINFO_MK)
@@ -88,7 +88,7 @@ if(NOT PVSS_FOUND)
# Search for the PVSS include directory
find_path(PVSS_INCLUDE_DIR
NAMES Basics/Utilities/Util.hxx
- PATHS ${PVSS_ROOT_DIR}
+ HINTS ${PVSS_ROOT_DIR}
PATH_SUFFIXES api/include)
set(PVSS_INCLUDE_DIRS ${PVSS_INCLUDE_DIR})
set(pvss_check_list PVSS_INCLUDE_DIR)
@@ -98,7 +98,7 @@ if(NOT PVSS_FOUND)
foreach(lib ${pvss_libraries})
find_library(PVSS_${lib}_LIBRARY
NAMES ${lib}${pvss_version}
- PATHS ${PVSS_ROOT_DIR}
+ HINTS ${PVSS_ROOT_DIR}
PATH_SUFFIXES api/lib.${osname})
list(APPEND pvss_check_list PVSS_${lib}_LIBRARY)
endforeach(lib Manager Messages Datapoint Basics bcm)
diff --git a/CMake/FindPyrap.cmake b/CMake/FindPyrap.cmake
index c06f788100e..7bf014e069e 100644
--- a/CMake/FindPyrap.cmake
+++ b/CMake/FindPyrap.cmake
@@ -33,9 +33,9 @@
if(NOT PYRAP_FOUND)
find_path(PYRAP_INCLUDE_DIR pyrap/Converters.h
- PATHS ${PYRAP_ROOT_DIR} PATH_SUFFIXES include)
+ HINTS ${PYRAP_ROOT_DIR} PATH_SUFFIXES include)
find_library(PYRAP_LIBRARY pyrap
- PATHS ${PYRAP_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${PYRAP_ROOT_DIR} PATH_SUFFIXES lib)
mark_as_advanced(PYRAP_INCLUDE_DIR PYRAP_LIBRARY)
# Pyrap also depends on Casacore
diff --git a/CMake/FindReadline.cmake b/CMake/FindReadline.cmake
index 7a6c9e56af8..6e1284a7413 100644
--- a/CMake/FindReadline.cmake
+++ b/CMake/FindReadline.cmake
@@ -33,9 +33,9 @@
if(NOT READLINE_FOUND)
find_path(READLINE_INCLUDE_DIR readline/readline.h
- PATHS ${READLINE_ROOT_DIR} PATH_SUFFIXES include)
+ HINTS ${READLINE_ROOT_DIR} PATH_SUFFIXES include)
find_library(READLINE_LIBRARY readline
- PATHS ${READLINE_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${READLINE_ROOT_DIR} PATH_SUFFIXES lib)
find_library(NCURSES_LIBRARY ncurses) # readline depends on libncurses
mark_as_advanced(READLINE_INCLUDE_DIR READLINE_LIBRARY NCURSES_LIBRARY)
diff --git a/CMake/FindValgrind.cmake b/CMake/FindValgrind.cmake
index d5991b1abc4..93c125a71c9 100644
--- a/CMake/FindValgrind.cmake
+++ b/CMake/FindValgrind.cmake
@@ -32,7 +32,7 @@
if(NOT VALGRIND_FOUND)
find_path(VALGRIND_INCLUDE_DIR valgrind/valgrind.h
- PATHS ${VALGRIND_ROOT_DIR} PATH_SUFFIXES include)
+ HINTS ${VALGRIND_ROOT_DIR} PATH_SUFFIXES include)
mark_as_advanced(VALGRIND_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
diff --git a/CMake/FindWCSLIB.cmake b/CMake/FindWCSLIB.cmake
index 3514aa006dd..077d66f1bfd 100644
--- a/CMake/FindWCSLIB.cmake
+++ b/CMake/FindWCSLIB.cmake
@@ -33,9 +33,9 @@
if(NOT WCSLIB_FOUND)
find_path(WCSLIB_INCLUDE_DIR wcslib/wcs.h
- PATHS ${WCSLIB_ROOT_DIR} PATH_SUFFIXES include)
+ HINTS ${WCSLIB_ROOT_DIR} PATH_SUFFIXES include)
find_library(WCSLIB_LIBRARY wcs
- PATHS ${WCSLIB_ROOT_DIR} PATH_SUFFIXES lib)
+ HINTS ${WCSLIB_ROOT_DIR} PATH_SUFFIXES lib)
find_library(M_LIBRARY m)
mark_as_advanced(WCSLIB_INCLUDE_DIR WCSLIB_LIBRARY M_LIBRARY)
--
GitLab