commit 396ed90aa17ba06e5d192755485adbadd2402316
author Brad King <brad.king@kitware.com> Tue Sep 20 12:55:40 2022 +0000
committer Kitware Robot <kwrobot@kitware.com> Tue Sep 20 08:55:47 2022 -0400
tree e054ad41e8b358b080d954cc0684c076802aac64
parent b15ddc766c1ff98465e31302cacc198426be9bd9
parent 37381506dcc004a62db39c7d62abe2240266b6a1

Merge topic 'help-byproducts'

37381506dc Help: Link from add_custom_target to policy on BYPRODUCTS

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

Source/CMakeVersion.cmake

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 488c8a9..81d2cb0 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 24)
-set(CMake_VERSION_PATCH 20220919)
+set(CMake_VERSION_PATCH 20220920)
 #set(CMake_VERSION_RC 0)
 set(CMake_VERSION_IS_DIRTY 0)
 

Source/cmCoreTryCompile.cxx

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 2f63b3c..3ef62a0 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -403,19 +403,19 @@
       this->Makefile->IssueMessage(
         MessageType::FATAL_ERROR,
         cmStrCat(arguments.LangProps.begin()->first,
-                 " allowed only in source file signature."));
+                 " allowed only in source file signature"));
       return false;
     }
     if (!arguments.CompileDefs.empty()) {
       this->Makefile->IssueMessage(
         MessageType::FATAL_ERROR,
-        "COMPILE_DEFINITIONS specified on a srcdir type TRY_COMPILE");
+        "COMPILE_DEFINITIONS allowed only in source file signature");
       return false;
     }
     if (arguments.CopyFileTo) {
       this->Makefile->IssueMessage(
         MessageType::FATAL_ERROR,
-        "COPY_FILE specified on a srcdir type TRY_COMPILE");
+        "COPY_FILE allowed only in source file signature");
       return false;
     }
   }

Tests/RunCMake/try_compile/NonSourceCompileDefinitions-stderr.txt

diff --git a/Tests/RunCMake/try_compile/NonSourceCompileDefinitions-stderr.txt b/Tests/RunCMake/try_compile/NonSourceCompileDefinitions-stderr.txt
index 3e48411..dcd5c7a 100644
--- a/Tests/RunCMake/try_compile/NonSourceCompileDefinitions-stderr.txt
+++ b/Tests/RunCMake/try_compile/NonSourceCompileDefinitions-stderr.txt
@@ -1,4 +1,4 @@
 CMake Error at NonSourceCompileDefinitions.cmake:[0-9]+ \(try_compile\):
-  COMPILE_DEFINITIONS specified on a srcdir type TRY_COMPILE
+  COMPILE_DEFINITIONS allowed only in source file signature
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)

Tests/RunCMake/try_compile/NonSourceCopyFile-stderr.txt

diff --git a/Tests/RunCMake/try_compile/NonSourceCopyFile-stderr.txt b/Tests/RunCMake/try_compile/NonSourceCopyFile-stderr.txt
index 7de8c92..1b7dfeb 100644
--- a/Tests/RunCMake/try_compile/NonSourceCopyFile-stderr.txt
+++ b/Tests/RunCMake/try_compile/NonSourceCopyFile-stderr.txt
@@ -1,4 +1,4 @@
 CMake Error at NonSourceCopyFile.cmake:[0-9]+ \(try_compile\):
-  COPY_FILE specified on a srcdir type TRY_COMPILE
+  COPY_FILE allowed only in source file signature
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)