diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-04 13:06:03 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-04 13:06:15 (GMT) |
| commit | 793c3dcabc1f0c7a5e4d920bd6affc46a47c1afc (patch) | |
| tree | 0477ce5487be4305792adf2ffaceead992090a2f | |
| parent | c63ee048cba7bf32c7f92a9c5c109b39c851af74 (diff) | |
| parent | bd11d78dfc0ba78f2c0679faa2cd73b6452c78dc (diff) | |
| download | CMake-793c3dcabc1f0c7a5e4d920bd6affc46a47c1afc.zip CMake-793c3dcabc1f0c7a5e4d920bd6affc46a47c1afc.tar.gz CMake-793c3dcabc1f0c7a5e4d920bd6affc46a47c1afc.tar.bz2 | |
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 <kwrobot@kitware.com>
Merge-request: !6951
| -rw-r--r-- | Help/dev/maint.rst | 4 | ||||
| -rw-r--r-- | Source/cmExportFileGenerator.cxx | 3 |
2 files changed, 3 insertions, 4 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 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"; |