From 6cd10ffed786b998e5b6f12557b6733fc325b558 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 20 Feb 2025 15:31:18 -0500 Subject: Tests: Cover CMAKE_POLICY_VERSION_MINIMUM as cache entry --- .../RunCMake/cmake_minimum_required/PolicyVersionVar-stderr.txt | 4 ++++ Tests/RunCMake/cmake_minimum_required/PolicyVersionVar.cmake | 7 +++++++ .../cmake_minimum_required/PolicyVersionVarBad-result.txt | 1 + .../cmake_minimum_required/PolicyVersionVarBad-stderr.txt | 9 +++++++++ Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad.cmake | 1 + .../cmake_minimum_required/PolicyVersionVariable-stderr.txt | 3 --- .../RunCMake/cmake_minimum_required/PolicyVersionVariable.cmake | 7 ------- .../cmake_minimum_required/PolicyVersionVariableBad-result.txt | 1 - .../cmake_minimum_required/PolicyVersionVariableBad-stderr.txt | 5 ----- .../cmake_minimum_required/PolicyVersionVariableBad.cmake | 2 -- Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake | 4 ++-- 11 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 Tests/RunCMake/cmake_minimum_required/PolicyVersionVar-stderr.txt create mode 100644 Tests/RunCMake/cmake_minimum_required/PolicyVersionVar.cmake create mode 100644 Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-result.txt create mode 100644 Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-stderr.txt create mode 100644 Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad.cmake delete mode 100644 Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable-stderr.txt delete mode 100644 Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable.cmake delete mode 100644 Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-result.txt delete mode 100644 Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-stderr.txt delete mode 100644 Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad.cmake diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVar-stderr.txt b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVar-stderr.txt new file mode 100644 index 0000000..75d5a7e --- /dev/null +++ b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVar-stderr.txt @@ -0,0 +1,4 @@ +^CMAKE_POLICY_VERSION_MINIMUM='3\.10' +CMAKE_MINIMUM_REQUIRED_VERSION='3\.1' +CMP0071='NEW' +CMP0072=''$ diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVar.cmake b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVar.cmake new file mode 100644 index 0000000..c8975dd --- /dev/null +++ b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVar.cmake @@ -0,0 +1,7 @@ +message("CMAKE_POLICY_VERSION_MINIMUM='${CMAKE_POLICY_VERSION_MINIMUM}'") +cmake_minimum_required(VERSION 3.1...3.4) +message("CMAKE_MINIMUM_REQUIRED_VERSION='${CMAKE_MINIMUM_REQUIRED_VERSION}'") +foreach(policy CMP0071 CMP0072) + cmake_policy(GET ${policy} status) + message("${policy}='${status}'") +endforeach() diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-result.txt b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-stderr.txt b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-stderr.txt new file mode 100644 index 0000000..ff6997d --- /dev/null +++ b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-stderr.txt @@ -0,0 +1,9 @@ +^CMake Error at CMakeLists\.txt:1 \(cmake_minimum_required\): + Invalid CMAKE_POLICY_VERSION_MINIMUM value "\.\.\.3\.10"\. A numeric + major\.minor\[\.patch\[\.tweak\]\] must be given\. ++ +CMake Error at PolicyVersionVarBad\.cmake:1 \(cmake_minimum_required\): + Invalid CMAKE_POLICY_VERSION_MINIMUM value "\.\.\.3\.10"\. A numeric + major\.minor\[\.patch\[\.tweak\]\] must be given\. +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad.cmake b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad.cmake new file mode 100644 index 0000000..c602a4a --- /dev/null +++ b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad.cmake @@ -0,0 +1 @@ +cmake_minimum_required(VERSION 3.1...3.4) diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable-stderr.txt b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable-stderr.txt deleted file mode 100644 index 4f161bf..0000000 --- a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable-stderr.txt +++ /dev/null @@ -1,3 +0,0 @@ -^CMAKE_MINIMUM_REQUIRED_VERSION='3\.1' -CMP0071='NEW' -CMP0072=''$ diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable.cmake b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable.cmake deleted file mode 100644 index 553fc94..0000000 --- a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(CMAKE_POLICY_VERSION_MINIMUM 3.10) -cmake_minimum_required(VERSION 3.1...3.4) -message("CMAKE_MINIMUM_REQUIRED_VERSION='${CMAKE_MINIMUM_REQUIRED_VERSION}'") -foreach(policy CMP0071 CMP0072) - cmake_policy(GET ${policy} status) - message("${policy}='${status}'") -endforeach() diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-result.txt b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-stderr.txt b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-stderr.txt deleted file mode 100644 index 3a59bb7..0000000 --- a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -^CMake Error at PolicyVersionVariableBad\.cmake:2 \(cmake_minimum_required\): - Invalid CMAKE_POLICY_VERSION_MINIMUM value "\.\.\.3\.10"\. A numeric - major\.minor\[\.patch\[\.tweak\]\] must be given\. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad.cmake b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad.cmake deleted file mode 100644 index 763997b..0000000 --- a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(CMAKE_POLICY_VERSION_MINIMUM ...3.10) -cmake_minimum_required(VERSION 3.1...3.4) diff --git a/Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake b/Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake index d91f171..0d2d0f6 100644 --- a/Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake +++ b/Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake @@ -7,5 +7,5 @@ run_cmake(BeforeVersionDeprecated) run_cmake(Range) run_cmake(RangeBad) run_cmake(Unknown) -run_cmake(PolicyVersionVariable) -run_cmake(PolicyVersionVariableBad) +run_cmake_with_options(PolicyVersionVar -DCMAKE_POLICY_VERSION_MINIMUM=3.10) +run_cmake_with_options(PolicyVersionVarBad -DCMAKE_POLICY_VERSION_MINIMUM=...3.10) -- cgit v0.12