From 177052d6b8b4127a9d345830fb3d82384e9d5b50 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 9 Jul 2020 00:27:25 +0200 Subject: set_property: Fix name of TARGET_DIRECTORY option in error messages --- Source/cmSetPropertyCommand.cxx | 2 +- Tests/RunCMake/get_property/source_properties_failures-stderr.txt | 6 +++--- Tests/RunCMake/set_property/SOURCE_FILE-stderr.txt | 2 +- 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\)$ -- cgit v0.12