diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-29 15:36:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-01-29 15:36:22 (GMT) |
| commit | d377ccbf672f4aba36131fed8151058ee0a97eed (patch) | |
| tree | 5b9019cd3f09f0312f60fe407b4d74c686948d26 /Tests/RunCMake | |
| parent | fdb05a421a2e49328dc19150a872d6c98362bcf4 (diff) | |
| parent | 339ae33e555b1820174ca99e9aaa04dffe29febc (diff) | |
| download | CMake-d377ccbf672f4aba36131fed8151058ee0a97eed.zip CMake-d377ccbf672f4aba36131fed8151058ee0a97eed.tar.gz CMake-d377ccbf672f4aba36131fed8151058ee0a97eed.tar.bz2 | |
Merge topic 'productbuild-domains-policy'
339ae33e55 CPack: Change CPACK_PRODUCTBUILD_DOMAINS default to true (CMP0161)
4e7f2397e4 CPack: Clear temporary variable after it is no longer needed
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9197
Diffstat (limited to 'Tests/RunCMake')
8 files changed, 33 insertions, 0 deletions
diff --git a/Tests/RunCMake/CPackConfig/CMP0161-NEW-check.cmake b/Tests/RunCMake/CPackConfig/CMP0161-NEW-check.cmake new file mode 100644 index 0000000..586fcf9 --- /dev/null +++ b/Tests/RunCMake/CPackConfig/CMP0161-NEW-check.cmake @@ -0,0 +1,3 @@ +include(${RunCMake_SOURCE_DIR}/check.cmake) + +test_variable(CPACK_PRODUCTBUILD_DOMAINS "ON") diff --git a/Tests/RunCMake/CPackConfig/CMP0161-NEW.cmake b/Tests/RunCMake/CPackConfig/CMP0161-NEW.cmake new file mode 100644 index 0000000..cc4d34b --- /dev/null +++ b/Tests/RunCMake/CPackConfig/CMP0161-NEW.cmake @@ -0,0 +1,2 @@ +cmake_policy(SET CMP0161 NEW) +set(CPACK_BINARY_PRODUCTBUILD ON CACHE BOOL "" FORCE) diff --git a/Tests/RunCMake/CPackConfig/CMP0161-OLD-check.cmake b/Tests/RunCMake/CPackConfig/CMP0161-OLD-check.cmake new file mode 100644 index 0000000..e3cb854 --- /dev/null +++ b/Tests/RunCMake/CPackConfig/CMP0161-OLD-check.cmake @@ -0,0 +1,5 @@ +include(${RunCMake_SOURCE_DIR}/check.cmake) + +if(DEFINED CPACK_PRODUCTBUILD_DOMANS) + message(FATAL_ERROR "CPACK_PRODUCTBUILD_DOMANS was defined, but it should not have been") +endif() diff --git a/Tests/RunCMake/CPackConfig/CMP0161-OLD.cmake b/Tests/RunCMake/CPackConfig/CMP0161-OLD.cmake new file mode 100644 index 0000000..4d47576 --- /dev/null +++ b/Tests/RunCMake/CPackConfig/CMP0161-OLD.cmake @@ -0,0 +1,2 @@ +cmake_policy(SET CMP0161 OLD) +set(CPACK_BINARY_PRODUCTBUILD ON CACHE BOOL "" FORCE) diff --git a/Tests/RunCMake/CPackConfig/CMP0161-WARN-check.cmake b/Tests/RunCMake/CPackConfig/CMP0161-WARN-check.cmake new file mode 100644 index 0000000..e3cb854 --- /dev/null +++ b/Tests/RunCMake/CPackConfig/CMP0161-WARN-check.cmake @@ -0,0 +1,5 @@ +include(${RunCMake_SOURCE_DIR}/check.cmake) + +if(DEFINED CPACK_PRODUCTBUILD_DOMANS) + message(FATAL_ERROR "CPACK_PRODUCTBUILD_DOMANS was defined, but it should not have been") +endif() diff --git a/Tests/RunCMake/CPackConfig/CMP0161-WARN-stderr-darwin.txt b/Tests/RunCMake/CPackConfig/CMP0161-WARN-stderr-darwin.txt new file mode 100644 index 0000000..5841ec7 --- /dev/null +++ b/Tests/RunCMake/CPackConfig/CMP0161-WARN-stderr-darwin.txt @@ -0,0 +1,12 @@ +^CMake Warning \(dev\) at [^ +]*/Modules/CPack\.cmake:[0-9]+ \(message\): + Policy CMP0161 is not set: CPACK_PRODUCTBUILD_DOMAINS defaults to true\. + Run "cmake --help-policy CMP0161" for policy details\. Use the cmake_policy + command to set the policy and suppress this warning\. + + For compatibility, CPACK_PRODUCTBUILD_DOMAINS will remain unset\. + Explicitly setting CPACK_PRODUCTBUILD_DOMAINS or setting policy CMP0161 to + NEW will prevent this warning\. +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\) +This warning is for project developers\. Use -Wno-dev to suppress it\.$ diff --git a/Tests/RunCMake/CPackConfig/CMP0161-WARN.cmake b/Tests/RunCMake/CPackConfig/CMP0161-WARN.cmake new file mode 100644 index 0000000..f387c69 --- /dev/null +++ b/Tests/RunCMake/CPackConfig/CMP0161-WARN.cmake @@ -0,0 +1 @@ +set(CPACK_BINARY_PRODUCTBUILD ON CACHE BOOL "" FORCE) diff --git a/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake b/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake index 32c7296..1de640b 100644 --- a/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake +++ b/Tests/RunCMake/CPackConfig/RunCMakeTest.cmake @@ -2,6 +2,9 @@ include(RunCMake) run_cmake(CMP0133-NEW) run_cmake(CMP0133-WARN) +run_cmake(CMP0161-NEW) +run_cmake(CMP0161-OLD) +run_cmake(CMP0161-WARN) run_cmake(Simple) run_cmake(Default) run_cmake(Special) |