From 99c131c5a33603ef4d365efae603e2e519acf33a Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 23 Jul 2020 06:55:48 -0400 Subject: cmGlobalGenerator: Fix spelling of EXCLUDE_FROM_ALL in error message --- Source/cmGlobalGenerator.cxx | 2 +- Tests/RunCMake/ExcludeFromAll/error-on-mixed-config-stderr.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index d39fefa..f14ffef 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2199,7 +2199,7 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root, // configurations. if (trueCount && falseCount) { std::ostringstream e; - e << "The EXCLUDED_FROM_ALL property of target \"" << target->GetName() + e << "The EXCLUDE_FROM_ALL property of target \"" << target->GetName() << "\" varies by configuration. This is not supported by the \"" << root->GetGlobalGenerator()->GetName() << "\" generator."; mf->IssueMessage(MessageType::FATAL_ERROR, e.str()); diff --git a/Tests/RunCMake/ExcludeFromAll/error-on-mixed-config-stderr.txt b/Tests/RunCMake/ExcludeFromAll/error-on-mixed-config-stderr.txt index eee5278..6dc785f 100644 --- a/Tests/RunCMake/ExcludeFromAll/error-on-mixed-config-stderr.txt +++ b/Tests/RunCMake/ExcludeFromAll/error-on-mixed-config-stderr.txt @@ -1,3 +1,3 @@ CMake Error in CMakeLists.txt: - The EXCLUDED_FROM_ALL property of target "release_only_tool" varies by + The EXCLUDE_FROM_ALL property of target "release_only_tool" varies by configuration. This is not supported by the "[^"]+" -- cgit v0.12 From 36743436cf9ada77bb6970fb295baa39dc4c79d1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 23 Jul 2020 06:51:40 -0400 Subject: Tests: Fix RunCMake.ExcludeFromAll test program warning Add a return value to `main()`. --- Tests/RunCMake/ExcludeFromAll/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Tests/RunCMake/ExcludeFromAll/main.c b/Tests/RunCMake/ExcludeFromAll/main.c index 5047a34..f8b643a 100644 --- a/Tests/RunCMake/ExcludeFromAll/main.c +++ b/Tests/RunCMake/ExcludeFromAll/main.c @@ -1,3 +1,4 @@ int main() { + return 0; } -- cgit v0.12 From 807c8aa9f010ead006763f4c5343580d46eeb58e Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 23 Jul 2020 07:07:12 -0400 Subject: Tests: Simplify RunCMake.ExcludeFromAll single-config case Also avoid using parts of an unrelated test (NinjaMultiConfig) that were not designed for use with all generators. --- Tests/RunCMake/ExcludeFromAll/RunCMakeTest.cmake | 2 +- Tests/RunCMake/ExcludeFromAll/single-config.cmake | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Tests/RunCMake/ExcludeFromAll/RunCMakeTest.cmake b/Tests/RunCMake/ExcludeFromAll/RunCMakeTest.cmake index 25201e4..2b4fc89 100644 --- a/Tests/RunCMake/ExcludeFromAll/RunCMakeTest.cmake +++ b/Tests/RunCMake/ExcludeFromAll/RunCMakeTest.cmake @@ -9,7 +9,7 @@ function(run_single_config_test label config exclude_from_all_value expectation) -DCMAKE_BUILD_TYPE=${config} -DTOOL_EXCLUDE_FROM_ALL=${exclude_from_all_value}) set(RunCMake_TEST_NO_CLEAN 1) - include(${RunCMake_TEST_BINARY_DIR}/target_files.cmake) + include(${RunCMake_TEST_BINARY_DIR}/target_files_${config}.cmake) run_cmake_command(${case}-build ${CMAKE_COMMAND} --build . --config ${config}) endfunction() diff --git a/Tests/RunCMake/ExcludeFromAll/single-config.cmake b/Tests/RunCMake/ExcludeFromAll/single-config.cmake index 71a9f06..aa49c21 100644 --- a/Tests/RunCMake/ExcludeFromAll/single-config.cmake +++ b/Tests/RunCMake/ExcludeFromAll/single-config.cmake @@ -2,10 +2,6 @@ enable_language(C) add_executable(tool main.c) set_property(TARGET tool PROPERTY EXCLUDE_FROM_ALL "${TOOL_EXCLUDE_FROM_ALL}") -include(../NinjaMultiConfig/Common.cmake) -set(orig_CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES}) -if("${CMAKE_CONFIGURATION_TYPES}" STREQUAL "") - set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE}) -endif() -generate_output_files(tool) -set(CMAKE_CONFIGURATION_TYPES ${orig_CMAKE_CONFIGURATION_TYPES}) +file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/target_files_$.cmake" CONTENT [[ +set(TARGET_FILE_tool_$ [==[$]==]) +]]) -- cgit v0.12 From 22bd2673889ac1ba49e8842959065068826f9368 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 23 Jul 2020 07:14:48 -0400 Subject: Help: Add release note for EXCLUDE_FROM_ALL genex support --- Help/release/dev/EXCLUDE_FROM_ALL-genex.rst | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Help/release/dev/EXCLUDE_FROM_ALL-genex.rst diff --git a/Help/release/dev/EXCLUDE_FROM_ALL-genex.rst b/Help/release/dev/EXCLUDE_FROM_ALL-genex.rst new file mode 100644 index 0000000..4d5a83c --- /dev/null +++ b/Help/release/dev/EXCLUDE_FROM_ALL-genex.rst @@ -0,0 +1,5 @@ +EXCLUDE_FROM_ALL-genex +---------------------- + +* The :prop_tgt:`EXCLUDE_FROM_ALL` target property gained support for + :manual:`generator expressions `. -- cgit v0.12