Bug#37734620: Contribution: Do not use NO_CACHE option of cmake find_xxx() commands

Author: TimeLooper

mysql-concpp-config.cmake.in

@@ -479,11 +479,12 @@ function(find_includes)
 
   #message(STATUS "Looking for headers at: ${INCLUDE_DIR}")
 
+  unset(MYSQL_CONCPP_INCLUDE_DIR CACHE)
   find_path(MYSQL_CONCPP_INCLUDE_DIR
     NAMES mysqlx/xdevapi.h
     PATHS ${INCLUDE_DIR}
     NO_DEFAULT_PATH
-    NO_CACHE
+    # NO_CACHE  # Note: requires cmake 3.21
   )
 
   if(NOT MYSQL_CONCPP_INCLUDE_DIR)
@@ -697,7 +698,7 @@ function(add_connector_target which tgt base_name)
   find_library(lib_path
     NAMES ${lib_name}
     ${find_lib_paths} ${win_opts}
-    NO_CACHE
+    # NO_CACHE
   )
 
   if(lib_path)
@@ -740,7 +741,7 @@ function(add_connector_target which tgt base_name)
       PATHS "${LIBRARY_DIR}/debug"
       ${win_opts}
       NO_DEFAULT_PATH
-      NO_CACHE
+      # NO_CACHE
     )
 
     if(lib_path_debug)
@@ -880,12 +881,13 @@ function(find_imp_lib var base_name path)
   set(CMAKE_FIND_LIBRARY_SUFFIXES .lib)
 
   #message("!!! Looking for import library for: ${path}")
+  unset(${var} CACHE)
   find_library(${var}
     NAMES ${base_name}
     PATHS ${base_path}
     PATH_SUFFIXES ${vs_suffix}
     NO_DEFAULT_PATH
-    NO_CACHE
+    # NO_CACHE
   )
 
   if(NOT ${var})
@@ -921,7 +923,7 @@ function(find_deps)
       PATHS ${LIBRARY_DIR}
       PATH_SUFFIXES private ${vs_suffix}
       NO_DEFAULT_PATH
-      NO_CACHE
+      # NO_CACHE
     )
 
     unset(ssl_crypto CACHE)
@@ -930,7 +932,7 @@ function(find_deps)
       PATHS ${LIBRARY_DIR}
       PATH_SUFFIXES private ${vs_suffix}
       NO_DEFAULT_PATH
-      NO_CACHE
+      # NO_CACHE
     )
 
     if(NOT ssl_lib OR NOT ssl_crypto)

testapp/CMakeLists.txt

@@ -75,12 +75,13 @@ function(find_openssl where)
     endif()
   endif()
 
+  unset(openssl CACHE)
   find_library(openssl
     NAMES ssl
     PATHS "${WITH_SSL}"
     PATH_SUFFIXES "" "lib" "lib64"
     NO_DEFAULT_PATH
-    NO_CACHE
+    # NO_CACHE # Note: requires cmake 3.21
   )
 
   if(NOT openssl)

testing/find_package/CMakeLists.txt

@@ -124,11 +124,12 @@ macro(add_version_tests)
 
     if(WITH_CONCPP)
 
-      find_file(INFO_SRC 
+      unset(INFO_SRC CACHE)
+      find_file(INFO_SRC
         NAME INFO_SRC
         PATHS ${WITH_CONCPP}
         NO_DEFAULT_PATH
-        NO_CACHE
+        #NO_CACHE # Note: requires cmake 3.21
       )
 
     else()
@@ -210,7 +211,7 @@ macro(add_version_tests)
 
     # Prepare options for run_test.cmake
 
-    set(test_opts 
+    set(test_opts
       "-DVERSION=${VERSION_${A}}"
       "-DWITH_DEBUG=${WITH_DEBUG}"
     )
@@ -256,12 +257,13 @@ macro(add_tests)
 
   if(WITH_SSL)
 
+    unset(openssl_lib CACHE)
     find_library(openssl_lib
       NAMES ssl libssl
       PATHS ${WITH_SSL}
       PATH_SUFFIXES lib
       NO_DEFAULT_PATH
-      NO_CACHE
+      # NO_CACHE
     )
 
   endif()
@@ -287,8 +289,8 @@ macro(add_tests)
     # Note: On Windows scenarios which build in Debug mode with static
     # connector library are added only if debug package is available.
 
-    if(WIN32 
-      AND A STREQUAL "static" 
+    if(WIN32
+      AND A STREQUAL "static"
       AND B STREQUAL "Debug"
       AND NOT WITH_DEBUG
     )
@@ -332,7 +334,7 @@ macro(add_tests)
     #
     # They are implemented by run_test.cmake -- see there.
 
-    add_test("config_${name_suffix}" 
+    add_test("config_${name_suffix}"
       ${CMAKE_COMMAND}
       "-DCDK_DIR=${CDK_DIR}"
       "-DCONCPP_SRC_DIR=${HOME_DIR}/../.."
@@ -347,7 +349,7 @@ macro(add_tests)
       FIXTURES_SETUP "${name_suffix}_configured"
     )
 
-    add_test("build_${name_suffix}" 
+    add_test("build_${name_suffix}"
       ${CMAKE_COMMAND}
       "-DCDK_DIR=${CDK_DIR}"
       "-DCONCPP_SRC_DIR=${HOME_DIR}/../.."
@@ -365,7 +367,7 @@ macro(add_tests)
 
     message(STATUS "# added test: build_${name_suffix}")
 
-    add_test("check_${name_suffix}" 
+    add_test("check_${name_suffix}"
       ${CMAKE_COMMAND}
       "-DCDK_DIR=${CDK_DIR}"
       "-DCONCPP_SRC_DIR=${HOME_DIR}/../.."

testing/find_package/run_test.cmake

@@ -182,11 +182,11 @@ function(action_check)
   foreach(exec devapi_test xapi_test jdbc_test)
 
     set(exec_path)
-    find_program(exec_path 
+    find_program(exec_path
       NAMES ${exec}
       PATHS "config_test/${out_dir}"
       NO_DEFAULT_PATH
-      NO_CACHE
+      # NO_CACHE # note: requires cmake 3.21
     )
 
     if(NOT EXISTS "${exec_path}")