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

@@ -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)
 

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)

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)
 

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)
 

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)
 

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)

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)

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)

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)

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)

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

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)
 

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)

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)