]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
build: Add "include guards" for bundled CMake find modules
authorJoel Rosdahl <joel@rosdahl.net>
Thu, 23 Apr 2026 06:45:36 +0000 (08:45 +0200)
committerJoel Rosdahl <joel@rosdahl.net>
Thu, 23 Apr 2026 06:54:44 +0000 (08:54 +0200)
Fixes #1737.

cmake/FindBlake3.cmake
cmake/FindCppHttplib.cmake
cmake/FindDoctest.cmake
cmake/FindFmt.cmake
cmake/FindHiredis.cmake
cmake/FindTlExpected.cmake
cmake/FindXxhash.cmake
cmake/FindZstd.cmake

index f7d2a81ab9c93c29ad860fd226e937a12ab9173e..b9325243dba47b4d8a1dac32d753504dee1aeb29 100644 (file)
@@ -1,3 +1,7 @@
+if(Blake3_FOUND)
+  return()
+endif()
+
 mark_as_advanced(BLAKE3_INCLUDE_DIR)
 mark_as_advanced(BLAKE3_LIBRARY)
 
@@ -28,3 +32,5 @@ else()
     message(STATUS "Using bundled Blake3 since Blake3>=${Blake3_FIND_VERSION} was not found locally")
   endif()
 endif()
+
+set(Blake3_FOUND 1)
index 3c68335a9456913a05997eb04bed1c6aca1fb72a..1b39cd537f6899fa95e5267ae7bc298ec550d205 100644 (file)
@@ -1,3 +1,7 @@
+if(CppHttplib_FOUND)
+  return()
+endif()
+
 mark_as_advanced(CPPHTTPLIB_INCLUDE_DIR)
 mark_as_advanced(CPPHTTPLIB_LIBRARY)
 
@@ -42,3 +46,5 @@ else()
     message(STATUS "Using bundled CppHttplib since CppHttplib>=${CppHttplib_FIND_VERSION} was not found locally")
   endif()
 endif()
+
+set(CppHttplib_FOUND 1)
index c4d4397093f0b7bd0d4ab945b4d757df09882509..f8bc6a6382468ad733b3ca6b1e2849cf95389797 100644 (file)
@@ -1,3 +1,7 @@
+if(Doctest_FOUND)
+  return()
+endif()
+
 mark_as_advanced(DOCTEST_INCLUDE_DIR)
 
 if(DEPS STREQUAL "DOWNLOAD" OR DEP_DOCTEST STREQUAL "DOWNLOAD")
@@ -39,3 +43,4 @@ if(_download_doctest)
 endif()
 
 register_dependency(Doctest "${_doctest_origin}" "${_doctest_version_string}")
+set(Doctest_FOUND 1)
index 3fa32f56d43be06445895f5cd3864e413ca0f170..b8825f0ac8a7555f2aa28c63d4052cc5d559711d 100644 (file)
@@ -1,3 +1,7 @@
+if(Fmt_FOUND)
+  return()
+endif()
+
 mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
 
 if(DEPS STREQUAL "DOWNLOAD" OR DEP_FMT STREQUAL "BUNDLED")
@@ -37,3 +41,5 @@ else()
     message(STATUS "Using bundled Fmt since Fmt>=${Fmt_FIND_VERSION} was not found locally")
   endif()
 endif()
+
+set(Fmt_FOUND 1)
index 559b98c35d8bf22558fb295aecd315cdd99aa198..c28e3bafee22659abf4271d0cd97ec90faebd6bd 100644 (file)
@@ -1,3 +1,7 @@
+if(Hiredis_FOUND)
+  return()
+endif()
+
 mark_as_advanced(HIREDIS_INCLUDE_DIR HIREDIS_LIBRARY)
 
 if(DEPS STREQUAL "DOWNLOAD" OR DEP_HIREDIS STREQUAL "DOWNLOAD")
@@ -76,3 +80,5 @@ if(WIN32)
 endif()
 
 register_dependency(Hiredis "${_hiredis_origin}" "${_hiredis_version_string}")
+
+set(Hiredis_FOUND 1)
index 93a6267b586c837208dd0b20b970197503145183..97007edc6a961aa067d81c9aa6c6cbe9c5b9fa42 100644 (file)
@@ -1,3 +1,7 @@
+if(TlExpected_FOUND)
+  return()
+endif()
+
 mark_as_advanced(TLEXPECTED_INCLUDE_DIR)
 
 if(DEP_TLEXPECTED STREQUAL "BUNDLED")
@@ -19,3 +23,5 @@ else()
     message(STATUS "Using bundled TlExpected since TlExpected>=${TlExpected_FIND_VERSION} was not found locally")
   endif()
 endif()
+
+set(TlExpected_FOUND 1)
index b1a1cdd3deeef66a2bd91596aeb6ac578db3d2e7..a9e1d101e995b23498be8460d840dae27dffc248 100644 (file)
@@ -1,3 +1,7 @@
+if(Xxhash_FOUND)
+  return()
+endif()
+
 mark_as_advanced(XXHASH_INCLUDE_DIR XXHASH_LIBRARY)
 
 if(DEPS STREQUAL "DOWNLOAD" OR DEP_XXHASH STREQUAL "DOWNLOAD")
@@ -66,3 +70,4 @@ if(WIN32)
 endif()
 
 register_dependency(Xxhash "${_xxhash_origin}" "${_xxhash_version_string}")
+set(Xxhash_FOUND 1)
index 9a7ffa7874562f95e3b539ada20660236a6aab85..aa642186d66f00f73331dc8f4426f6a0d720a301 100644 (file)
@@ -1,3 +1,7 @@
+if(Zstd_FOUND)
+  return()
+endif()
+
 mark_as_advanced(ZSTD_INCLUDE_DIR ZSTD_LIBRARY)
 
 if(DEPS STREQUAL "DOWNLOAD" OR DEP_ZSTD STREQUAL "DOWNLOAD")
@@ -75,3 +79,4 @@ if(_download_zstd)
 endif()
 
 register_dependency(Zstd "${_zstd_origin}" "${_zstd_version_string}")
+set(Zstd_FOUND 1)