From d184bf0659403275fe50862b5a7aecc88bb872b3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 4 Feb 2022 06:39:28 -0500 Subject: Replace DEVEL_CMAKE_VERSION with literal 3.23 release version This was accidentally left out of commit 736663deed (Begin 3.23 release versioning, 2022-02-03). The step is documented as part of the release branching process in the CMake Maintainer Guide `Help/dev/maint.rst`. --- Source/cmExportFileGenerator.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 412d104..2d80f0e 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/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"; -- cgit v0.12 From bd11d78dfc0ba78f2c0679faa2cd73b6452c78dc Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 4 Feb 2022 06:48:18 -0500 Subject: Help/dev: Clarify maintainer guide step for DEVEL_CMAKE_VERSION The previous wording could be misread as ensuring the arguments to the call match the release version. Clarify that one needs to remove the call and replace it with the literal release version string. --- Help/dev/maint.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst index 54d627d..151ea5a 100644 --- a/Help/dev/maint.rst +++ b/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 -- cgit v0.12