Browse Source

cxxmodules: remove `CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP` variable

It is now subsumed by the UUID setting completely.
Ben Boeckel 2 years ago
parent
commit
0183e1bca3
48 changed files with 16 additions and 199 deletions
  1. 0 2
      .gitlab/ci/cxx_modules_rules_clang.cmake
  2. 0 1
      .gitlab/ci/cxx_modules_rules_gcc.cmake
  3. 0 2
      .gitlab/ci/cxx_modules_rules_msvc.cmake
  4. 0 7
      Help/dev/experimental.rst
  5. 3 1
      Source/cmGeneratorTarget.cxx
  6. 0 15
      Source/cmGlobalGenerator.cxx
  7. 0 4
      Source/cmGlobalGenerator.h
  8. 0 1
      Source/cmGlobalNinjaGenerator.cxx
  9. 0 1
      Source/cmGlobalVisualStudioVersionedGenerator.h
  10. 1 6
      Tests/RunCMake/CXXModules/ExportBuildCxxModules-stderr.txt
  11. 0 1
      Tests/RunCMake/CXXModules/ExportBuildCxxModules.cmake
  12. 1 6
      Tests/RunCMake/CXXModules/ExportInstallCxxModules-stderr.txt
  13. 0 1
      Tests/RunCMake/CXXModules/ExportInstallCxxModules.cmake
  14. 1 6
      Tests/RunCMake/CXXModules/FileSetModulesPrivate-stderr.txt
  15. 0 1
      Tests/RunCMake/CXXModules/FileSetModulesPrivate.cmake
  16. 1 6
      Tests/RunCMake/CXXModules/FileSetModulesPublic-stderr.txt
  17. 0 1
      Tests/RunCMake/CXXModules/FileSetModulesPublic.cmake
  18. 1 6
      Tests/RunCMake/CXXModules/NinjaDependInfoBMIInstall-stderr.txt
  19. 0 1
      Tests/RunCMake/CXXModules/NinjaDependInfoBMIInstall.cmake
  20. 1 6
      Tests/RunCMake/CXXModules/NinjaDependInfoExport-stderr.txt
  21. 0 1
      Tests/RunCMake/CXXModules/NinjaDependInfoExport.cmake
  22. 1 6
      Tests/RunCMake/CXXModules/NinjaDependInfoFileSet-stderr.txt
  23. 0 1
      Tests/RunCMake/CXXModules/NinjaDependInfoFileSet.cmake
  24. 3 1
      Tests/RunCMake/CXXModules/NoCXX20ModuleFlag.cmake
  25. 2 12
      Tests/RunCMake/CXXModules/NoDyndepSupport-stderr.txt
  26. 0 1
      Tests/RunCMake/CXXModules/NoDyndepSupport.cmake
  27. 1 1
      Tests/RunCMake/CXXModules/NotCXXSourceModules-stderr.txt
  28. 0 1
      Tests/RunCMake/CXXModules/NotCXXSourceModules.cmake
  29. 0 5
      Tests/RunCMake/CXXModules/examples/circular-stderr.txt
  30. 0 5
      Tests/RunCMake/CXXModules/examples/deep-chain-stderr.txt
  31. 0 5
      Tests/RunCMake/CXXModules/examples/duplicate-stderr.txt
  32. 0 5
      Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build-stderr.txt
  33. 0 5
      Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install-stderr.txt
  34. 0 5
      Tests/RunCMake/CXXModules/examples/export-interface-build-stderr.txt
  35. 0 5
      Tests/RunCMake/CXXModules/examples/export-interface-install-stderr.txt
  36. 0 5
      Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build-stderr.txt
  37. 0 5
      Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install-stderr.txt
  38. 0 5
      Tests/RunCMake/CXXModules/examples/generated-stderr.txt
  39. 0 5
      Tests/RunCMake/CXXModules/examples/install-bmi-and-interfaces-stderr.txt
  40. 0 5
      Tests/RunCMake/CXXModules/examples/install-bmi-stderr.txt
  41. 0 5
      Tests/RunCMake/CXXModules/examples/internal-partitions-stderr.txt
  42. 0 5
      Tests/RunCMake/CXXModules/examples/library-shared-stderr.txt
  43. 0 5
      Tests/RunCMake/CXXModules/examples/library-static-stderr.txt
  44. 0 5
      Tests/RunCMake/CXXModules/examples/partitions-stderr.txt
  45. 0 5
      Tests/RunCMake/CXXModules/examples/public-req-private-stderr.txt
  46. 0 5
      Tests/RunCMake/CXXModules/examples/req-private-other-target-stderr.txt
  47. 0 5
      Tests/RunCMake/CXXModules/examples/scan_properties-stderr.txt
  48. 0 5
      Tests/RunCMake/CXXModules/examples/simple-stderr.txt

+ 0 - 2
.gitlab/ci/cxx_modules_rules_clang.cmake

@@ -1,7 +1,5 @@
 set(CMake_TEST_CXXModules_UUID "a246741c-d067-4019-a8fb-3d16b0c9d1d3")
 set(CMake_TEST_CXXModules_UUID "a246741c-d067-4019-a8fb-3d16b0c9d1d3")
 
 
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
-
 # Default to C++ extensions being off. Clang's modules support have trouble
 # Default to C++ extensions being off. Clang's modules support have trouble
 # with extensions right now.
 # with extensions right now.
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_EXTENSIONS OFF)

+ 0 - 1
.gitlab/ci/cxx_modules_rules_gcc.cmake

@@ -1,6 +1,5 @@
 set(CMake_TEST_CXXModules_UUID "a246741c-d067-4019-a8fb-3d16b0c9d1d3")
 set(CMake_TEST_CXXModules_UUID "a246741c-d067-4019-a8fb-3d16b0c9d1d3")
 
 
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
 string(CONCAT CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE
 string(CONCAT CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE
   "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E -x c++ <SOURCE>"
   "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E -x c++ <SOURCE>"
   " -MT <DYNDEP_FILE> -MD -MF <DEP_FILE>"
   " -MT <DYNDEP_FILE> -MD -MF <DEP_FILE>"

+ 0 - 2
.gitlab/ci/cxx_modules_rules_msvc.cmake

@@ -1,3 +1 @@
 set(CMake_TEST_CXXModules_UUID "a246741c-d067-4019-a8fb-3d16b0c9d1d3")
 set(CMake_TEST_CXXModules_UUID "a246741c-d067-4019-a8fb-3d16b0c9d1d3")
-
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)

+ 0 - 7
Help/dev/experimental.rst

@@ -63,12 +63,6 @@ dependencies, set the following variables:
 ``CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API``
 ``CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API``
   Set this to the UUID documented above.
   Set this to the UUID documented above.
 
 
-``CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP``
-  Set this to ``1`` in order to activate this undocumented experimental
-  infrastructure.  This is **intended to make the functionality available
-  to compiler writers** so they can use it to develop and test their
-  dependency scanning tool.
-
 Some compilers already have support for module dependency scanning:
 Some compilers already have support for module dependency scanning:
 
 
 * MSVC 19.34 and newer (provided with Visual Studio 17.4 and newer)
 * MSVC 19.34 and newer (provided with Visual Studio 17.4 and newer)
@@ -92,7 +86,6 @@ For example, add code like the following to a test project:
 
 
 .. code-block:: cmake
 .. code-block:: cmake
 
 
-  set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
   string(CONCAT CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE
   string(CONCAT CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE
     "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> <SOURCE>"
     "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> <SOURCE>"
     " -MT <DYNDEP_FILE> -MD -MF <DEP_FILE>"
     " -MT <DYNDEP_FILE> -MD -MF <DEP_FILE>"

+ 3 - 1
Source/cmGeneratorTarget.cxx

@@ -28,6 +28,7 @@
 #include "cmComputeLinkInformation.h"
 #include "cmComputeLinkInformation.h"
 #include "cmCustomCommandGenerator.h"
 #include "cmCustomCommandGenerator.h"
 #include "cmEvaluatedTargetProperty.h"
 #include "cmEvaluatedTargetProperty.h"
+#include "cmExperimental.h"
 #include "cmFileSet.h"
 #include "cmFileSet.h"
 #include "cmFileTimes.h"
 #include "cmFileTimes.h"
 #include "cmGeneratedFileStream.h"
 #include "cmGeneratedFileStream.h"
@@ -8907,7 +8908,8 @@ cmGeneratorTarget::Cxx20SupportLevel cmGeneratorTarget::HaveCxxModuleSupport(
   // Else, an empty CMAKE_CXX_STANDARD_DEFAULT means CMake does not detect and
   // Else, an empty CMAKE_CXX_STANDARD_DEFAULT means CMake does not detect and
   // set a default standard level for this compiler, so assume all standards
   // set a default standard level for this compiler, so assume all standards
   // are available.
   // are available.
-  if (!this->Makefile->IsOn("CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP")) {
+  if (!cmExperimental::HasSupportEnabled(
+        *this->Makefile, cmExperimental::Feature::CxxModuleCMakeApi)) {
     return Cxx20SupportLevel::MissingExperimentalFlag;
     return Cxx20SupportLevel::MissingExperimentalFlag;
   }
   }
   return Cxx20SupportLevel::Supported;
   return Cxx20SupportLevel::Supported;

+ 0 - 15
Source/cmGlobalGenerator.cxx

@@ -1465,19 +1465,6 @@ bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const
   return false;
   return false;
 }
 }
 
 
-void cmGlobalGenerator::CxxModuleSupportCheck() const
-{
-  bool const diagnose = !this->DiagnosedCxxModuleSupport &&
-    !this->CMakeInstance->GetIsInTryCompile();
-  if (diagnose) {
-    this->DiagnosedCxxModuleSupport = true;
-    this->GetCMakeInstance()->IssueMessage(
-      MessageType::AUTHOR_WARNING,
-      "C++20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP "
-      "is experimental.  It is meant only for compiler developers to try.");
-  }
-}
-
 void cmGlobalGenerator::ComputeBuildFileGenerators()
 void cmGlobalGenerator::ComputeBuildFileGenerators()
 {
 {
   for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) {
   for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) {
@@ -1641,8 +1628,6 @@ void cmGlobalGenerator::Generate()
   // it builds by default.
   // it builds by default.
   this->InitializeProgressMarks();
   this->InitializeProgressMarks();
 
 
-  this->DiagnosedCxxModuleSupport = false;
-
   this->ProcessEvaluationFiles();
   this->ProcessEvaluationFiles();
 
 
   this->CMakeInstance->UpdateProgress("Generating", 0.1f);
   this->CMakeInstance->UpdateProgress("Generating", 0.1f);

+ 0 - 4
Source/cmGlobalGenerator.h

@@ -661,8 +661,6 @@ protected:
 
 
   virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const;
   virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const;
 
 
-  void CxxModuleSupportCheck() const;
-
   bool AddHeaderSetVerification();
   bool AddHeaderSetVerification();
 
 
   bool AddAutomaticSources();
   bool AddAutomaticSources();
@@ -775,8 +773,6 @@ private:
   std::map<std::string, StripCommandStyle> StripCommandStyleMap;
   std::map<std::string, StripCommandStyle> StripCommandStyleMap;
 #endif
 #endif
 
 
-  mutable bool DiagnosedCxxModuleSupport = false;
-
   // Deferral id generation.
   // Deferral id generation.
   size_t NextDeferId = 0;
   size_t NextDeferId = 0;
 
 

+ 0 - 1
Source/cmGlobalNinjaGenerator.cxx

@@ -874,7 +874,6 @@ bool cmGlobalNinjaGenerator::CheckLanguages(
 
 
 bool cmGlobalNinjaGenerator::CheckCxxModuleSupport()
 bool cmGlobalNinjaGenerator::CheckCxxModuleSupport()
 {
 {
-  this->CxxModuleSupportCheck();
   if (this->NinjaSupportsDyndepsCxx) {
   if (this->NinjaSupportsDyndepsCxx) {
     return true;
     return true;
   }
   }

+ 0 - 1
Source/cmGlobalVisualStudioVersionedGenerator.h

@@ -50,7 +50,6 @@ public:
 
 
   bool CheckCxxModuleSupport() override
   bool CheckCxxModuleSupport() override
   {
   {
-    this->CxxModuleSupportCheck();
     return this->SupportsCxxModuleDyndep();
     return this->SupportsCxxModuleDyndep();
   }
   }
   bool SupportsCxxModuleDyndep() const override
   bool SupportsCxxModuleDyndep() const override

+ 1 - 6
Tests/RunCMake/CXXModules/ExportBuildCxxModules-stderr.txt

@@ -1,11 +1,6 @@
-CMake Warning \(dev\) at ExportBuildCxxModules.cmake:6 \(target_sources\):
+CMake Warning \(dev\) at ExportBuildCxxModules.cmake:5 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 Call Stack \(most recent call first\):
 Call Stack \(most recent call first\):
   CMakeLists.txt:6 \(include\)
   CMakeLists.txt:6 \(include\)
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 1
Tests/RunCMake/CXXModules/ExportBuildCxxModules.cmake

@@ -1,5 +1,4 @@
 enable_language(CXX)
 enable_language(CXX)
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 
 
 add_library(export-modules)
 add_library(export-modules)

+ 1 - 6
Tests/RunCMake/CXXModules/ExportInstallCxxModules-stderr.txt

@@ -1,11 +1,6 @@
-CMake Warning \(dev\) at ExportInstallCxxModules.cmake:6 \(target_sources\):
+CMake Warning \(dev\) at ExportInstallCxxModules.cmake:5 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 Call Stack \(most recent call first\):
 Call Stack \(most recent call first\):
   CMakeLists.txt:6 \(include\)
   CMakeLists.txt:6 \(include\)
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 1
Tests/RunCMake/CXXModules/ExportInstallCxxModules.cmake

@@ -1,5 +1,4 @@
 enable_language(CXX)
 enable_language(CXX)
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 
 
 add_library(export-modules)
 add_library(export-modules)

+ 1 - 6
Tests/RunCMake/CXXModules/FileSetModulesPrivate-stderr.txt

@@ -1,11 +1,6 @@
-CMake Warning \(dev\) at FileSetModulesPrivate.cmake:6 \(target_sources\):
+CMake Warning \(dev\) at FileSetModulesPrivate.cmake:5 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 Call Stack \(most recent call first\):
 Call Stack \(most recent call first\):
   CMakeLists.txt:6 \(include\)
   CMakeLists.txt:6 \(include\)
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 1
Tests/RunCMake/CXXModules/FileSetModulesPrivate.cmake

@@ -1,5 +1,4 @@
 enable_language(CXX)
 enable_language(CXX)
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 
 
 add_library(module)
 add_library(module)

+ 1 - 6
Tests/RunCMake/CXXModules/FileSetModulesPublic-stderr.txt

@@ -1,11 +1,6 @@
-CMake Warning \(dev\) at FileSetModulesPublic.cmake:6 \(target_sources\):
+CMake Warning \(dev\) at FileSetModulesPublic.cmake:5 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 Call Stack \(most recent call first\):
 Call Stack \(most recent call first\):
   CMakeLists.txt:6 \(include\)
   CMakeLists.txt:6 \(include\)
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 1
Tests/RunCMake/CXXModules/FileSetModulesPublic.cmake

@@ -1,5 +1,4 @@
 enable_language(CXX)
 enable_language(CXX)
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 
 
 add_library(module)
 add_library(module)

+ 1 - 6
Tests/RunCMake/CXXModules/NinjaDependInfoBMIInstall-stderr.txt

@@ -1,11 +1,6 @@
-CMake Warning \(dev\) at NinjaDependInfoBMIInstall.cmake:14 \(target_sources\):
+CMake Warning \(dev\) at NinjaDependInfoBMIInstall.cmake:13 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 Call Stack \(most recent call first\):
 Call Stack \(most recent call first\):
   CMakeLists.txt:6 \(include\)
   CMakeLists.txt:6 \(include\)
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 1
Tests/RunCMake/CXXModules/NinjaDependInfoBMIInstall.cmake

@@ -1,6 +1,5 @@
 # Fake out that we have dyndep; we only need to generate, not actually build
 # Fake out that we have dyndep; we only need to generate, not actually build
 # here.
 # here.
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 
 
 enable_language(CXX)
 enable_language(CXX)

+ 1 - 6
Tests/RunCMake/CXXModules/NinjaDependInfoExport-stderr.txt

@@ -1,11 +1,6 @@
-CMake Warning \(dev\) at NinjaDependInfoExport.cmake:14 \(target_sources\):
+CMake Warning \(dev\) at NinjaDependInfoExport.cmake:13 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 Call Stack \(most recent call first\):
 Call Stack \(most recent call first\):
   CMakeLists.txt:6 \(include\)
   CMakeLists.txt:6 \(include\)
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 1
Tests/RunCMake/CXXModules/NinjaDependInfoExport.cmake

@@ -1,6 +1,5 @@
 # Fake out that we have dyndep; we only need to generate, not actually build
 # Fake out that we have dyndep; we only need to generate, not actually build
 # here.
 # here.
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 
 
 enable_language(CXX)
 enable_language(CXX)

+ 1 - 6
Tests/RunCMake/CXXModules/NinjaDependInfoFileSet-stderr.txt

@@ -1,11 +1,6 @@
-CMake Warning \(dev\) at NinjaDependInfoFileSet.cmake:14 \(target_sources\):
+CMake Warning \(dev\) at NinjaDependInfoFileSet.cmake:13 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 Call Stack \(most recent call first\):
 Call Stack \(most recent call first\):
   CMakeLists.txt:6 \(include\)
   CMakeLists.txt:6 \(include\)
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 1
Tests/RunCMake/CXXModules/NinjaDependInfoFileSet.cmake

@@ -1,6 +1,5 @@
 # Fake out that we have dyndep; we only need to generate, not actually build
 # Fake out that we have dyndep; we only need to generate, not actually build
 # here.
 # here.
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 
 
 enable_language(CXX)
 enable_language(CXX)

+ 3 - 1
Tests/RunCMake/CXXModules/NoCXX20ModuleFlag.cmake

@@ -1,6 +1,6 @@
 enable_language(CXX)
 enable_language(CXX)
 
 
-unset(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP)
+set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "echo")
 
 
 add_library(noexperimentalflag)
 add_library(noexperimentalflag)
 target_sources(noexperimentalflag
 target_sources(noexperimentalflag
@@ -10,3 +10,5 @@ target_sources(noexperimentalflag
 target_compile_features(noexperimentalflag
 target_compile_features(noexperimentalflag
   PRIVATE
   PRIVATE
     cxx_std_20)
     cxx_std_20)
+
+unset(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API)

+ 2 - 12
Tests/RunCMake/CXXModules/NoDyndepSupport-stderr.txt

@@ -1,16 +1,11 @@
-CMake Warning \(dev\) at NoDyndepSupport.cmake:10 \(target_sources\):
+CMake Warning \(dev\) at NoDyndepSupport.cmake:9 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 Call Stack \(most recent call first\):
 Call Stack \(most recent call first\):
   CMakeLists.txt:6 \(include\)
   CMakeLists.txt:6 \(include\)
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 
 
-(CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Error:
+(CMake Error:
   The Ninja generator does not support C\+\+20 modules using Ninja version
   The Ninja generator does not support C\+\+20 modules using Ninja version
 
 
     .*
     .*
@@ -22,11 +17,6 @@ CMake Error:
   by the generator
   by the generator
 
 
 (
 (
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.
-)?(
 CMake Error in CMakeLists.txt:
 CMake Error in CMakeLists.txt:
   The "nodyndep" target contains C\+\+ module sources which are not supported
   The "nodyndep" target contains C\+\+ module sources which are not supported
   by the generator
   by the generator

+ 0 - 1
Tests/RunCMake/CXXModules/NoDyndepSupport.cmake

@@ -1,5 +1,4 @@
 enable_language(CXX)
 enable_language(CXX)
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 
 
 if (NOT CMAKE_CXX_STANDARD_DEFAULT)
 if (NOT CMAKE_CXX_STANDARD_DEFAULT)

+ 1 - 1
Tests/RunCMake/CXXModules/NotCXXSourceModules-stderr.txt

@@ -1,4 +1,4 @@
-CMake Warning \(dev\) at NotCXXSourceModules.cmake:7 \(target_sources\):
+CMake Warning \(dev\) at NotCXXSourceModules.cmake:6 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 Call Stack \(most recent call first\):
 Call Stack \(most recent call first\):

+ 0 - 1
Tests/RunCMake/CXXModules/NotCXXSourceModules.cmake

@@ -1,6 +1,5 @@
 enable_language(C)
 enable_language(C)
 enable_language(CXX)
 enable_language(CXX)
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "")
 
 
 add_library(not-cxx-source)
 add_library(not-cxx-source)

+ 0 - 5
Tests/RunCMake/CXXModules/examples/circular-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:7 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/deep-chain-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:7 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/duplicate-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:7 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:[0-9]+ \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:[0-9]+ \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/export-interface-build-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:[0-9] \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/export-interface-install-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:[0-9]+ \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:[0-9]+ \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:[0-9]+ \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/generated-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:12 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/install-bmi-and-interfaces-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:7 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/install-bmi-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:7 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/internal-partitions-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:10 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/library-shared-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:10 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/library-static-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:10 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/partitions-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:10 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/public-req-private-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:7 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/req-private-other-target-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:7 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/scan_properties-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:25 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.

+ 0 - 5
Tests/RunCMake/CXXModules/examples/simple-stderr.txt

@@ -2,8 +2,3 @@ CMake Warning \(dev\) at CMakeLists.txt:7 \(target_sources\):
   CMake's C\+\+ module support is experimental.  It is meant only for
   CMake's C\+\+ module support is experimental.  It is meant only for
   experimentation and feedback to CMake developers.
   experimentation and feedback to CMake developers.
 This warning is for project developers.  Use -Wno-dev to suppress it.
 This warning is for project developers.  Use -Wno-dev to suppress it.
-
-CMake Warning \(dev\):
-  C\+\+20 modules support via CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP is
-  experimental.  It is meant only for compiler developers to try.
-This warning is for project developers.  Use -Wno-dev to suppress it.