Merge topic '2024-bootstrap-pkgconfig-ldflags'

da5de7f9f3 bootstrap: Allow --boostrap-system-* libraries custom prefixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9307

.gitlab/ci/configure_windows_msvc_common.cmake

diff --git a/.gitlab/ci/configure_windows_msvc_common.cmake b/.gitlab/ci/configure_windows_msvc_common.cmake
index 6d66a05..946eca7 100644
--- a/.gitlab/ci/configure_windows_msvc_common.cmake
+++ b/.gitlab/ci/configure_windows_msvc_common.cmake
@@ -1,2 +1,4 @@
+set(CMake_TEST_Java OFF CACHE BOOL "")
+
 set(configure_no_sccache 1)
 include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")

Source/CMakeVersion.cmake

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a126f5c..3b3b3aa 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,7 +1,7 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 29)
-set(CMake_VERSION_PATCH 20240304)
+set(CMake_VERSION_PATCH 20240305)
 #set(CMake_VERSION_RC 0)
 set(CMake_VERSION_IS_DIRTY 0)
 

Source/cmImportedCxxModuleInfo.cxx

diff --git a/Source/cmImportedCxxModuleInfo.cxx b/Source/cmImportedCxxModuleInfo.cxx
index c54b265..ad49a8d 100644
--- a/Source/cmImportedCxxModuleInfo.cxx
+++ b/Source/cmImportedCxxModuleInfo.cxx
@@ -69,7 +69,6 @@
     bmiName = cmStrCat(dirhash.substr(0, HASH_TRUNCATION), ".bmi");
   }
 
-  this->GeneratorInfo.emplace(
-    path, ImportedCxxModuleGeneratorInfo{ &importit->second, bmiName });
+  this->GeneratorInfo.emplace(path, ImportedCxxModuleGeneratorInfo{ bmiName });
   return bmiName;
 }

Source/cmImportedCxxModuleInfo.h

diff --git a/Source/cmImportedCxxModuleInfo.h b/Source/cmImportedCxxModuleInfo.h
index e052283..1b29a06 100644
--- a/Source/cmImportedCxxModuleInfo.h
+++ b/Source/cmImportedCxxModuleInfo.h
@@ -16,7 +16,6 @@
 
 struct ImportedCxxModuleGeneratorInfo
 {
-  ImportedCxxModuleInfo const* ImportedInfo;
   std::string const BmiName;
 };