Updated CMake "Find" modules to give priority to user paths

Author: jgonzalezdr

cmake/Modules/FindCppUTest.cmake

@@ -16,34 +16,33 @@ else()
     set( CPPUTESTEXT_LIBNAME "CppUTestExt" )
 endif()
 
+set( CPPUTEST_HINTS "" )
 if( DEFINED ENV{CPPUTEST_HOME} )
-    set( CPPUTEST_PATHS "$ENV{CPPUTEST_HOME}/lib" ${CPPUTEST_PATHS} )
+    set( CPPUTEST_HINTS "$ENV{CPPUTEST_HOME}/lib" ${CPPUTEST_HINTS} )
 endif()
-
 if( CPPUTEST_HOME )
-    set( CPPUTEST_PATHS "${CPPUTEST_HOME}/lib" ${CPPUTEST_PATHS} )
+    set( CPPUTEST_HINTS "${CPPUTEST_HOME}/lib" ${CPPUTEST_HINTS} )
 endif()
-
 if( CppUTest_HOME )
-    set( CPPUTEST_PATHS "${CppUTest_HOME}/lib" ${CPPUTEST_PATHS} )
+    set( CPPUTEST_HINTS "${CppUTest_HOME}/lib" ${CPPUTEST_HINTS} )
 endif()
 
-find_library( CppUTest_LIB_PATH NAMES ${CPPUTEST_LIBNAME} PATHS ${CPPUTEST_PATHS} )
+find_library( CppUTest_LIB_PATH NAMES ${CPPUTEST_LIBNAME} PATHS ${CPPUTEST_PATHS} HINTS ${CPPUTEST_HINTS} )
 mark_as_advanced( CppUTest_LIB_PATH  )
 
 get_filename_component( CppUTest_LIBRARY_DIR ${CppUTest_LIB_PATH} DIRECTORY )
 
 if( NOT MSVC )
-    find_library( CppUTestExt_LIB_PATH NAMES ${CPPUTESTEXT_LIBNAME} PATHS ${CppUTest_LIBRARY_DIR} NO_DEFAULT_PATH )
+    find_library( CppUTestExt_LIB_PATH NAMES ${CPPUTESTEXT_LIBNAME} HINTS ${CppUTest_LIBRARY_DIR} NO_DEFAULT_PATH )
     mark_as_advanced( CppUTestExt_LIB_PATH  )
 endif()
 
 if( WIN32 )
-    find_library( CppUTest_DEBUG_LIB_PATH NAMES ${CPPUTEST_LIBNAME}d PATHS ${CppUTest_LIBRARY_DIR} NO_DEFAULT_PATH )
+    find_library( CppUTest_DEBUG_LIB_PATH NAMES ${CPPUTEST_LIBNAME}d HINTS ${CppUTest_LIBRARY_DIR} NO_DEFAULT_PATH )
     mark_as_advanced( CppUTest_DEBUG_LIB_PATH  )
 
     if( NOT MSVC )
-        find_library( CppUTestExt_DEBUG_LIB_PATH NAMES ${CPPUTESTEXT_LIBNAME}d PATHS ${CppUTest_LIBRARY_DIR} NO_DEFAULT_PATH )
+        find_library( CppUTestExt_DEBUG_LIB_PATH NAMES ${CPPUTESTEXT_LIBNAME}d HINTS ${CppUTest_LIBRARY_DIR} NO_DEFAULT_PATH )
         mark_as_advanced( CppUTestExt_DEBUG_LIB_PATH  )
     endif()
 endif()

cmake/Modules/FindLCOV.cmake

@@ -5,18 +5,17 @@ else()
 endif()
 
 if( DEFINED ENV{LCOV_HOME} )
-    set( LCOV_PATHS "$ENV{LCOV_HOME}/bin" ${LCOV_PATHS} )
+    set( LCOV_HINTS "$ENV{LCOV_HOME}/bin" ${LCOV_HINTS} )
 endif()
-
 if( LCOV_HOME )
-    set( LCOV_PATHS "${LCOV_HOME}/bin" ${LCOV_PATHS} )
+    set( LCOV_HINTS "${LCOV_HOME}/bin" ${LCOV_HINTS} )
 endif()
 
-find_program( LCOV_EXECUTABLE lcov PATHS ${LCOV_PATHS} )
+find_program( LCOV_EXECUTABLE lcov PATHS ${LCOV_PATHS} HINTS ${LCOV_HINTS} )
 
 get_filename_component( LCOV_BASE_DIR ${LCOV_EXECUTABLE} DIRECTORY )
 
-find_program( GENHTML_EXECUTABLE genhtml PATHS ${LCOV_BASE_DIR} NO_DEFAULT_PATH )
+find_program( GENHTML_EXECUTABLE genhtml HINTS ${LCOV_BASE_DIR} NO_DEFAULT_PATH )
 
 if( LCOV_EXECUTABLE )
     find_package( Perl REQUIRED )
@@ -29,15 +28,15 @@ if( LCOV_EXECUTABLE )
             RESULT_VARIABLE LCOV_VERSION_RESULT_VARIABLE
             ERROR_QUIET
             OUTPUT_STRIP_TRAILING_WHITESPACE )
-            
+
         if( NOT LCOV_VERSION_RESULT_VARIABLE )
             string( REGEX REPLACE "^[^:]*: LCOV version (.+)$" "\\1" LCOV_VERSION_STRING ${LCOV_VERSION_OUTPUT_VARIABLE} )
         endif()
     endif()
 endif()
 
 include( FindPackageHandleStandardArgs )
-find_package_handle_standard_args( LCOV 
+find_package_handle_standard_args( LCOV
                                    REQUIRED_VARS LCOV_EXECUTABLE GENHTML_EXECUTABLE
                                    VERSION_VAR LCOV_VERSION_STRING )
 

cmake/Modules/FindLibClang.cmake

@@ -6,19 +6,18 @@ else()
     set( LIBCLANG_LIBNAME "clang" )
 endif()
 
+set( LIBCLANG_HINTS "" )
 if( DEFINED ENV{LIBCLANG_HOME} )
-    set( LIBCLANG_PATHS "$ENV{LIBCLANG_HOME}" ${LIBCLANG_PATHS} )
+    set( LIBCLANG_HINTS "$ENV{LIBCLANG_HOME}" ${LIBCLANG_HINTS} )
 endif()
-
 if( LIBCLANG_HOME )
-    set( LIBCLANG_PATHS "${LIBCLANG_HOME}" ${LIBCLANG_PATHS} )
+    set( LIBCLANG_HINTS "${LIBCLANG_HOME}" ${LIBCLANG_HINTS} )
 endif()
-
 if( LibClang_HOME )
-    set( LIBCLANG_PATHS "${LibClang_HOME}" ${LIBCLANG_PATHS} )
+    set( LIBCLANG_HINTS "${LibClang_HOME}" ${LIBCLANG_HINTS} )
 endif()
 
-find_path( LibClang_BASE_DIR include/clang-c/Index.h PATHS ${LIBCLANG_PATHS} )
+find_path( LibClang_BASE_DIR include/clang-c/Index.h PATHS ${LIBCLANG_PATHS} HINTS ${LIBCLANG_HINTS} )
 
 if( NOT WIN32 )
     string( REGEX MATCH "-[^-]+$" LIBCLANG_VERSION_SUFFIX ${LibClang_BASE_DIR} )