From 1dabbbb5e0961edf453f939daec16d156f0666f9 Mon Sep 17 00:00:00 2001 From: Deniz Bahadir Date: Wed, 20 Mar 2024 00:42:16 +0100 Subject: CMP0118: Revise documentation to describe actual behavior The policy was originally intended to make the `GENERATED` source file property globally visible, but the implementation didn't fully achieve that goal. Revise the documentation to describe what it actually does. Issue: #25437 --- Help/manual/cmake-policies.7.rst | 2 +- Help/policy/CMP0118.rst | 29 +++++++++-------- Help/prop_sf/GENERATED.rst | 14 +++------ Help/release/3.20.rst | 5 +-- Source/cmPolicies.h | 8 ++--- .../CMP0118/CMP0118-WARN-Test11-stderr.txt | 8 ++--- .../CMP0118/CMP0118-WARN-Test13-stderr.txt | 8 ++--- .../CMP0118/CMP0118-WARN-Test15-stderr.txt | 8 ++--- .../RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt | 36 +++++++++++----------- .../CMP0118/CMP0118-WARN-Test4b-stderr.txt | 36 +++++++++++----------- .../RunCMake/CMP0118/CMP0118-WARN-Test5-stderr.txt | 24 +++++++-------- .../RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt | 8 ++--- .../RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt | 8 ++--- 13 files changed, 98 insertions(+), 96 deletions(-) diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst index ba74e68..9717e3d 100644 --- a/Help/manual/cmake-policies.7.rst +++ b/Help/manual/cmake-policies.7.rst @@ -171,7 +171,7 @@ Policies Introduced by CMake 3.20 CMP0120: The WriteCompilerDetectionHeader module is removed. CMP0119: LANGUAGE source file property explicitly compiles as language. - CMP0118: The GENERATED source file property is now visible in all directories. + CMP0118: GENERATED sources may be used across directories without manual marking. CMP0117: MSVC RTTI flag /GR is not added to CMAKE_CXX_FLAGS by default. CMP0116: Ninja generators transform DEPFILEs from add_custom_command(). CMP0115: Source file extensions must be explicit. diff --git a/Help/policy/CMP0118.rst b/Help/policy/CMP0118.rst index 00afadf..593beac 100644 --- a/Help/policy/CMP0118.rst +++ b/Help/policy/CMP0118.rst @@ -3,25 +3,30 @@ CMP0118 .. versionadded:: 3.20 -The :prop_sf:`GENERATED` source file property is now visible in all directories. +:prop_sf:`GENERATED` sources may be used across directories without manual marking. -Whether or not a source file is generated is an all-or-nothing global -property of the source. Consequently, the associated ``GENERATED`` -property is now visible from any directory scope, not only from the scope -for which it was set. +In CMake 3.19 and below, the :prop_sf:`GENERATED` source file property, +like other source file properties, was scoped in every directory separately. +If a source file was generated in one directory, projects had to manually +set the ``GENERATED`` property in another directory in order to use the file. +Whether or not a source file is generated is an all-or-nothing global +property of the source: a source is either generated or it is not. +CMake 3.20 and above prefer to allow source files generated in one directory +to be used in other directories without manually marking them as ``GENERATED``. Additionally, the ``GENERATED`` property may now be set only to boolean -values, and may not be turned off once turned on. +values, and may not be turned off once turned on. This policy provides +compatibility for projects that have not been updated for this behavior. -The ``OLD`` behavior of this policy is to only allow ``GENERATED`` to be -visible from the directory scope for which it was set. The ``NEW`` -behavior on the other hand allows it to be visible from any scope. +The ``OLD`` behavior of this policy is to allow generated files to be used +only in directories in which their ``GENERATED`` property has been turned on. +The ``NEW`` behavior of this policy is to allow generated files to be used +in other directories without explicitly turning on the ``GENERATED`` property +for those directories. .. |INTRODUCED_IN_CMAKE_VERSION| replace:: 3.20 .. |WARNS_OR_DOES_NOT_WARN| replace:: - does *not* warn with regard to visibility of the ``GENERATED`` - property, but does warn about setting the ``GENERATED`` property - to a non-boolean value, + warns about setting the ``GENERATED`` property to a non-boolean value .. include:: STANDARD_ADVICE.txt .. include:: DEPRECATED.txt diff --git a/Help/prop_sf/GENERATED.rst b/Help/prop_sf/GENERATED.rst index 5ecc86c..d68ae4b 100644 --- a/Help/prop_sf/GENERATED.rst +++ b/Help/prop_sf/GENERATED.rst @@ -4,7 +4,11 @@ GENERATED Is this source file generated as part of the build or CMake process. .. versionchanged:: 3.20 - The GENERATED source file property is now visible in all directories. + Turning on the ``GENERATED`` source file property in one directory allows + the associated source file to be used across directories without the need + to manually setting that property for other directory scopes, too. + Additionally, it may now be set only to boolean values, and may not be + turned off once turned on. See policy :policy:`CMP0118`. Tells the internal CMake engine that a source file is generated by an outside process such as another build step, or the execution of CMake itself. @@ -38,11 +42,3 @@ be shown. For the special case of sources generated by CMake's :prop_tgt:`AUTOMO :prop_gbl:`AUTORCC_SOURCE_GROUP` and :prop_gbl:`AUTOUIC_SOURCE_GROUP` target properties may influence where the generated sources are grouped in the project's file lists. - -.. note:: - - Starting with CMake 3.20 the ``GENERATED`` source file property can be set - and retrieved from any directory scope. It is an all-or-nothing property. - It also can no longer be removed or unset if it was set to ``TRUE``. Policy - :policy:`CMP0118` was introduced to allow supporting the ``OLD`` behavior - for some time. diff --git a/Help/release/3.20.rst b/Help/release/3.20.rst index ebd0f91..51e4594 100644 --- a/Help/release/3.20.rst +++ b/Help/release/3.20.rst @@ -147,8 +147,9 @@ Properties for the associated :variable:`CMAKE_EXPORT_COMPILE_COMMANDS` variable to allow for configuration of exporting compile commands per target. -* The :prop_sf:`GENERATED` source-file property is now visible - from any directory scope, regardless of the scope in which it is set. +* Generated sources may be used across directories without manual marking. + Additionally, the :prop_sf:`GENERATED` source file property can no longer be + turned off once turned on, nor can it be set to other than boolean values. See policy :policy:`CMP0118`. * The :prop_tgt:`UNITY_BUILD_UNIQUE_ID` target property diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index 6d86516..43ea993 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -349,10 +349,10 @@ class cmMakefile; SELECT(POLICY, CMP0117, \ "MSVC RTTI flag /GR is not added to CMAKE_CXX_FLAGS by default.", 3, \ 20, 0, cmPolicies::WARN) \ - SELECT( \ - POLICY, CMP0118, \ - "The GENERATED source file property is now visible in all directories.", \ - 3, 20, 0, cmPolicies::WARN) \ + SELECT(POLICY, CMP0118, \ + "GENERATED sources may be used across directories without manual " \ + "marking.", \ + 3, 20, 0, cmPolicies::WARN) \ SELECT(POLICY, CMP0119, \ "LANGUAGE source file property explicitly compiles as specified " \ "language.", \ diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt index 93d8b83..9395cd7 100644 --- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt +++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt @@ -1,6 +1,6 @@ ^((CMake Warning \(dev\) at subdir-Common-Test11/CMakeLists\.txt:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -9,8 +9,8 @@ This warning is for project developers\. Use -Wno-dev to suppress it\. +)+ (CMake Warning \(dev\) at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_subdirectory\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt index 6d59cb4..957cc69 100644 --- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt +++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt @@ -8,8 +8,8 @@ CMake Error at subdir-Common-Test13/CMakeLists\.txt:[0-9]+ \(add_custom_command\ TARGET 'custom[4-6]' was not created in this directory\. + ((CMake Warning \(dev\) at subdir-Common-Test13/CMakeLists\.txt:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -18,8 +18,8 @@ CMake Error at subdir-Common-Test13/CMakeLists\.txt:[0-9]+ \(add_custom_command\ This warning is for project developers\. Use -Wno-dev to suppress it\. +)+ (CMake Warning \(dev\) at CMP0118-Common-Test13\.cmake:[0-9]+ \(add_subdirectory\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt index 9e6a4a5..eab051f 100644 --- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt +++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt @@ -1,6 +1,6 @@ ^((CMake Warning \(dev\) at subdir-Common-Test15/CMakeLists\.txt:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -9,8 +9,8 @@ This warning is for project developers\. Use -Wno-dev to suppress it\. +)+ (CMake Warning \(dev\) at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_subdirectory\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt index 4cd401c..6340f91 100644 --- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt +++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt @@ -1,6 +1,6 @@ ^CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -18,8 +18,8 @@ Generated_with_full_path1\.txt: # 2b # GENERATED = `0` Generated_with_full_path1\.txt: # 3a # GENERATED = `0` Generated_with_full_path1\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -37,8 +37,8 @@ Generated_with_full_path2\.txt: # 2b # GENERATED = `0` Generated_with_full_path2\.txt: # 3a # GENERATED = `0` Generated_with_full_path2\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -56,8 +56,8 @@ Generated_with_full_path3\.txt: # 2b # GENERATED = `0` Generated_with_full_path3\.txt: # 3a # GENERATED = `0` Generated_with_full_path3\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -75,8 +75,8 @@ Generated_with_relative_path1\.txt: # 2b # GENERATED = `0` Generated_with_relative_path1\.txt: # 3a # GENERATED = `0` Generated_with_relative_path1\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -94,8 +94,8 @@ Generated_with_relative_path2\.txt: # 2b # GENERATED = `0` Generated_with_relative_path2\.txt: # 3a # GENERATED = `0` Generated_with_relative_path2\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -113,8 +113,8 @@ Generated_with_relative_path3\.txt: # 2b # GENERATED = `0` Generated_with_relative_path3\.txt: # 3a # GENERATED = `0` Generated_with_relative_path3\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -132,8 +132,8 @@ Generated_with_full_source_path1\.txt: # 2b # GENERATED = `0` Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0` Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -151,8 +151,8 @@ Generated_with_full_source_path2\.txt: # 2b # GENERATED = `0` Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0` Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4b-stderr.txt index 6acd3df..a213ae5 100644 --- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4b-stderr.txt +++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4b-stderr.txt @@ -1,6 +1,6 @@ ^CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -18,8 +18,8 @@ Generated_with_full_path1\.txt: # 2b # GENERATED = `0` Generated_with_full_path1\.txt: # 3a # GENERATED = `0` Generated_with_full_path1\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -37,8 +37,8 @@ Generated_with_full_path2\.txt: # 2b # GENERATED = `0` Generated_with_full_path2\.txt: # 3a # GENERATED = `0` Generated_with_full_path2\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -56,8 +56,8 @@ Generated_with_full_path3\.txt: # 2b # GENERATED = `0` Generated_with_full_path3\.txt: # 3a # GENERATED = `0` Generated_with_full_path3\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -75,8 +75,8 @@ Generated_with_relative_path1\.txt: # 2b # GENERATED = `0` Generated_with_relative_path1\.txt: # 3a # GENERATED = `0` Generated_with_relative_path1\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -94,8 +94,8 @@ Generated_with_relative_path2\.txt: # 2b # GENERATED = `0` Generated_with_relative_path2\.txt: # 3a # GENERATED = `0` Generated_with_relative_path2\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -113,8 +113,8 @@ Generated_with_relative_path3\.txt: # 2b # GENERATED = `0` Generated_with_relative_path3\.txt: # 3a # GENERATED = `0` Generated_with_relative_path3\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -132,8 +132,8 @@ Generated_with_full_source_path1\.txt: # 2b # GENERATED = `0` Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0` Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -151,8 +151,8 @@ Generated_with_full_source_path2\.txt: # 2b # GENERATED = `0` Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0` Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test5-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test5-stderr.txt index f9d2fee..2f7a390 100644 --- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test5-stderr.txt +++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test5-stderr.txt @@ -5,8 +5,8 @@ Generated_with_full_path1\.txt: # 2b # GENERATED = `1` Generated_with_full_path1\.txt: # 3a # GENERATED = `0` Generated_with_full_path1\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -24,8 +24,8 @@ Generated_with_full_path2\.txt: # 2b # GENERATED = `0` Generated_with_full_path2\.txt: # 3a # GENERATED = `0` Generated_with_full_path2\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -57,8 +57,8 @@ Generated_with_relative_path1\.txt: # 2b # GENERATED = `1` Generated_with_relative_path1\.txt: # 3a # GENERATED = `0` Generated_with_relative_path1\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -76,8 +76,8 @@ Generated_with_relative_path2\.txt: # 2b # GENERATED = `0` Generated_with_relative_path2\.txt: # 3a # GENERATED = `0` Generated_with_relative_path2\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -109,8 +109,8 @@ Generated_with_full_source_path1\.txt: # 2b # GENERATED = `1` Generated_with_full_source_path1\.txt: # 3a # GENERATED = `1` Generated_with_full_source_path1\.txt: # 3b # GENERATED = `1` CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -128,8 +128,8 @@ Generated_with_full_source_path2\.txt: # 2b # GENERATED = `0` Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0` Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0` CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt index cde1164..1feef65 100644 --- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt +++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt @@ -1,6 +1,6 @@ ^((CMake Warning \(dev\) at subdir-Common-Test7/CMakeLists\.txt:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -9,8 +9,8 @@ This warning is for project developers\. Use -Wno-dev to suppress it\. +)+ (CMake Warning \(dev\) at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_subdirectory\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt index 547e820..cbce4ab 100644 --- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt +++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt @@ -1,6 +1,6 @@ ^((CMake Warning \(dev\) at subdir-Common-Test9/CMakeLists\.txt:[0-9]+ \(set_property\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. @@ -9,8 +9,8 @@ This warning is for project developers\. Use -Wno-dev to suppress it\. +)+ (CMake Warning \(dev\) at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_subdirectory\): - Policy CMP0118 is not set: The GENERATED source file property is now - visible in all directories\. Run "cmake --help-policy CMP0118" for policy + Policy CMP0118 is not set: GENERATED sources may be used across directories + without manual marking\. Run "cmake --help-policy CMP0118" for policy details\. Use the cmake_policy command to set the policy and suppress this warning\. -- cgit v0.12