diff --git a/CMake/FindCFITSIO.cmake b/CMake/FindCFITSIO.cmake
index e0e4d67de2953d207f4394f6ae88a8cb6d3ff78e..85c26039240cb32123b871c5c35390098ee20fb3 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 dadf67cd96a5f5c56aaba3aba77911ea02bd8a39..d46adf56be8067074267765e5ee36c8dec3ffea4 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 9fe17a69f167033b53de55986d6626be7abd50ec..8db8f2c84cf3c5bdd6a38e238157be57e60ecbcb 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 ed709ff94a00e26a3f40ae680e34f0dbf3d235f2..d37423a1f289e489ba81a55f92855179ef434282 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 66cd242062ac754a7487638d35369f80f14793a9..866f5d1321e9d5a4e150d43bbb5c3d6dbaff3323 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 50b3931c974b9fab2302e00c311753ab1cb109d2..b6b459bbe99b10c98ee990a0c6b1cc1c80a6d714 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 0c47d1401c52d56e8f0756ac8190965e111241b0..14247728c20c9b9fa8707d8e396df96d8a42445d 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 c2408d1cc3256530e8ea4244bcafdb4d2c3b866c..4033960c2de3cf89a3b6613b05e3e710ab6e0073 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 ebffc9697c2699b119df44b7e8f3e88a1f36b5b7..d98df40217b28266d52258ce2bbca8058ea38efa 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 37e00e3ae79ce1d220ebbf703611079b9d696a8f..806344d1192e3bd310034a45fdeed8d79b907a21 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 c06f788100ef9a2fa73d7e1e39ba6e41cc47312b..7bf014e069eafb01e99ee41dcaa4c7d962342e45 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 7a6c9e56af89bacc9980bb755478655fc19d4357..6e1284a741315816b42d1d58866be207f9bebeda 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 d5991b1abc48a6685f24fe277479685414d2efe1..93c125a71c962c686be5edebef9b613f58e82913 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 3514aa006ddf1ac65846762ec47bc2c8e70e8884..077d66f1bfdafc0a0335ab26a4aec6a092579c73 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)