From 9ffbc0e6287a19e38d1e03481db4b57b95caa056 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 9 Dec 2024 19:27:32 -0500 Subject: Tests/RunCMake/cmake_minimum_required: Generalize deprecated version case name --- .../cmake_minimum_required/Before3_10-stderr.txt | 29 ---------------------- .../cmake_minimum_required/Before3_10.cmake | 6 ----- .../BeforeVersionDeprecated-stderr.txt | 29 ++++++++++++++++++++++ .../BeforeVersionDeprecated.cmake | 6 +++++ .../cmake_minimum_required/RunCMakeTest.cmake | 2 +- 5 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 Tests/RunCMake/cmake_minimum_required/Before3_10-stderr.txt delete mode 100644 Tests/RunCMake/cmake_minimum_required/Before3_10.cmake create mode 100644 Tests/RunCMake/cmake_minimum_required/BeforeVersionDeprecated-stderr.txt create mode 100644 Tests/RunCMake/cmake_minimum_required/BeforeVersionDeprecated.cmake diff --git a/Tests/RunCMake/cmake_minimum_required/Before3_10-stderr.txt b/Tests/RunCMake/cmake_minimum_required/Before3_10-stderr.txt deleted file mode 100644 index 4a6842b..0000000 --- a/Tests/RunCMake/cmake_minimum_required/Before3_10-stderr.txt +++ /dev/null @@ -1,29 +0,0 @@ -^CMake Deprecation Warning at Before3_10\.cmake:1 \(cmake_minimum_required\): - Compatibility with CMake < 3\.10 will be removed from a future version of - CMake\. - - Update the VERSION argument value\. Or, use the \.\.\. syntax - to tell CMake that the project requires at least but has been updated - to work with policies introduced by or earlier\. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Deprecation Warning at Before3_10\.cmake:2 \(cmake_policy\): - Compatibility with CMake < 3\.10 will be removed from a future version of - CMake\. - - Update the VERSION argument value\. Or, use the \.\.\. syntax - to tell CMake that the project requires at least but has been updated - to work with policies introduced by or earlier\. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -+ -CMake Deprecation Warning at Before3_10\.cmake:6 \(cmake_policy\): - Compatibility with CMake < 3\.10 will be removed from a future version of - CMake\. - - Update the VERSION argument value\. Or, use the \.\.\. syntax - to tell CMake that the project requires at least but has been updated - to work with policies introduced by or earlier\. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/cmake_minimum_required/Before3_10.cmake b/Tests/RunCMake/cmake_minimum_required/Before3_10.cmake deleted file mode 100644 index 0b010ef..0000000 --- a/Tests/RunCMake/cmake_minimum_required/Before3_10.cmake +++ /dev/null @@ -1,6 +0,0 @@ -cmake_minimum_required(VERSION 3.9) -cmake_policy(VERSION 2.6) -cmake_policy(PUSH) -cmake_policy(VERSION 2.6) # simulate pre-3.18 install(EXPORT)-generated call -cmake_policy(POP) -cmake_policy(VERSION 3.9) diff --git a/Tests/RunCMake/cmake_minimum_required/BeforeVersionDeprecated-stderr.txt b/Tests/RunCMake/cmake_minimum_required/BeforeVersionDeprecated-stderr.txt new file mode 100644 index 0000000..5af7abb --- /dev/null +++ b/Tests/RunCMake/cmake_minimum_required/BeforeVersionDeprecated-stderr.txt @@ -0,0 +1,29 @@ +^CMake Deprecation Warning at BeforeVersionDeprecated\.cmake:1 \(cmake_minimum_required\): + Compatibility with CMake < 3\.10 will be removed from a future version of + CMake\. + + Update the VERSION argument value\. Or, use the \.\.\. syntax + to tell CMake that the project requires at least but has been updated + to work with policies introduced by or earlier\. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) ++ +CMake Deprecation Warning at BeforeVersionDeprecated\.cmake:2 \(cmake_policy\): + Compatibility with CMake < 3\.10 will be removed from a future version of + CMake\. + + Update the VERSION argument value\. Or, use the \.\.\. syntax + to tell CMake that the project requires at least but has been updated + to work with policies introduced by or earlier\. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) ++ +CMake Deprecation Warning at BeforeVersionDeprecated\.cmake:6 \(cmake_policy\): + Compatibility with CMake < 3\.10 will be removed from a future version of + CMake\. + + Update the VERSION argument value\. Or, use the \.\.\. syntax + to tell CMake that the project requires at least but has been updated + to work with policies introduced by or earlier\. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/cmake_minimum_required/BeforeVersionDeprecated.cmake b/Tests/RunCMake/cmake_minimum_required/BeforeVersionDeprecated.cmake new file mode 100644 index 0000000..0b010ef --- /dev/null +++ b/Tests/RunCMake/cmake_minimum_required/BeforeVersionDeprecated.cmake @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.9) +cmake_policy(VERSION 2.6) +cmake_policy(PUSH) +cmake_policy(VERSION 2.6) # simulate pre-3.18 install(EXPORT)-generated call +cmake_policy(POP) +cmake_policy(VERSION 3.9) diff --git a/Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake b/Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake index 2851c72..6de792e 100644 --- a/Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake +++ b/Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake @@ -4,7 +4,7 @@ run_cmake(Before24) run_cmake(CompatBefore24) run_cmake(Future) run_cmake(PolicyBefore24) -run_cmake(Before3_10) +run_cmake(BeforeVersionDeprecated) run_cmake(Range) run_cmake(RangeBad) run_cmake(Unknown) -- cgit v0.12