summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-07-08 22:27:25 (GMT)
committerBrad King <brad.king@kitware.com>2020-07-09 10:33:03 (GMT)
commit177052d6b8b4127a9d345830fb3d82384e9d5b50 (patch)
tree776520852b0d1b5232f0a6de41947ac68e3db0f0
parent8adfa16e207f046b9ac825c4ec97c041ef4fe541 (diff)
downloadCMake-177052d6b8b4127a9d345830fb3d82384e9d5b50.zip
CMake-177052d6b8b4127a9d345830fb3d82384e9d5b50.tar.gz
CMake-177052d6b8b4127a9d345830fb3d82384e9d5b50.tar.bz2
set_property: Fix name of TARGET_DIRECTORY option in error messages
-rw-r--r--Source/cmSetPropertyCommand.cxx2
-rw-r--r--Tests/RunCMake/get_property/source_properties_failures-stderr.txt6
-rw-r--r--Tests/RunCMake/set_property/SOURCE_FILE-stderr.txt2
3 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index 07cb7c9..11afc14 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -101,7 +101,7 @@ bool HandleSourceFileDirectoryScopes(
cmTarget* target = current_dir_mf->FindTargetToUse(target_name);
if (!target) {
status.SetError(cmStrCat(
- "given non-existent target for DIRECTORY_TARGET ", target_name));
+ "given non-existent target for TARGET_DIRECTORY ", target_name));
return false;
}
cmProp target_source_dir = target->GetProperty("SOURCE_DIR");
diff --git a/Tests/RunCMake/get_property/source_properties_failures-stderr.txt b/Tests/RunCMake/get_property/source_properties_failures-stderr.txt
index a500e2e..0accb8f 100644
--- a/Tests/RunCMake/get_property/source_properties_failures-stderr.txt
+++ b/Tests/RunCMake/get_property/source_properties_failures-stderr.txt
@@ -16,7 +16,7 @@ Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)
+
CMake Error at source_properties_failures.cmake:4 \(set_source_files_properties\):
- set_source_files_properties given non-existent target for DIRECTORY_TARGET
+ set_source_files_properties given non-existent target for TARGET_DIRECTORY
non_existing_target
Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)
@@ -39,7 +39,7 @@ Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)
+
CMake Error at source_properties_failures.cmake:9 \(get_property\):
- get_property given non-existent target for DIRECTORY_TARGET
+ get_property given non-existent target for TARGET_DIRECTORY
non_existing_dir
Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)
@@ -55,7 +55,7 @@ Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)
+
CMake Error at source_properties_failures.cmake:13 \(get_source_file_property\):
- get_source_file_property given non-existent target for DIRECTORY_TARGET
+ get_source_file_property given non-existent target for TARGET_DIRECTORY
PROPERTY
Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/set_property/SOURCE_FILE-stderr.txt b/Tests/RunCMake/set_property/SOURCE_FILE-stderr.txt
index 2e0b238..a2b6cf4 100644
--- a/Tests/RunCMake/set_property/SOURCE_FILE-stderr.txt
+++ b/Tests/RunCMake/set_property/SOURCE_FILE-stderr.txt
@@ -16,7 +16,7 @@ Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)
+
CMake Error at SOURCE_FILE.cmake:4 \(set_property\):
- set_property given non-existent target for DIRECTORY_TARGET
+ set_property given non-existent target for TARGET_DIRECTORY
non_existing_target
Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)$