Просмотр исходного кода

Merge topic 'rel-version' into release-3.23

bd11d78dfc Help/dev: Clarify maintainer guide step for DEVEL_CMAKE_VERSION
d184bf0659 Replace DEVEL_CMAKE_VERSION with literal 3.23 release version

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6951
Brad King 4 лет назад
Родитель
Сommit
793c3dcabc
2 измененных файлов с 3 добавлено и 4 удалено
  1. 2 2
      Help/dev/maint.rst
  2. 1 2
      Source/cmExportFileGenerator.cxx

+ 2 - 2
Help/dev/maint.rst

@@ -270,8 +270,8 @@ Update ``Source/CMakeVersion.cmake`` to set the version to
   set(CMake_VERSION_PATCH 0)
   set(CMake_VERSION_RC 0)
 
-Update uses of ``DEVEL_CMAKE_VERSION`` in the source tree to mention the
-actual version number:
+Replace uses of ``DEVEL_CMAKE_VERSION`` in the source tree with
+the literal release version number string ``"$major.$minor.0"``:
 
 .. code-block:: shell
 

+ 1 - 2
Source/cmExportFileGenerator.cxx

@@ -1272,8 +1272,7 @@ void cmExportFileGenerator::GenerateTargetFileSets(cmGeneratorTarget* gte,
   auto interfaceFileSets = gte->Target->GetAllInterfaceFileSets();
   if (!interfaceFileSets.empty()) {
     std::string targetName = cmStrCat(this->Namespace, gte->GetExportName());
-    os << "if(NOT CMAKE_VERSION VERSION_LESS \"" << DEVEL_CMAKE_VERSION(3, 23)
-       << "\")\n"
+    os << "if(NOT CMAKE_VERSION VERSION_LESS \"3.23.0\")\n"
           "  target_sources("
        << targetName << "\n";