diff options
| author | friendlyanon <friendlyanon_@hotmail.com> | 2022-11-11 16:15:30 +0100 |
|---|---|---|
| committer | friendlyanon <friendlyanon_@hotmail.com> | 2022-11-11 22:49:36 +0100 |
| commit | 59573bf5b9afb2157c73b18dd189a0927dafee52 (patch) | |
| tree | a51943c3be8f4430a314560e5afba145013b28a3 /Tests/RunCMake | |
| parent | 23f3dd9f7c87bbf02685f388cb3913a8878e4f3b (diff) | |
| download | cmake-59573bf5b9afb2157c73b18dd189a0927dafee52.tar.gz | |
project: Warn at top-level if `cmake_minimum_required` wasn't called
The top-level project() call will now issue an AUTHOR_WARNING if it
wasn't called after cmake_minimum_required().
Fixes: #24071
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CommandLine/C_buildsrcdir/initial-cache.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/project/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/project/NoMinimumRequired-stderr.txt | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/project/NoMinimumRequired.cmake | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/project/RunCMakeTest.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/project_injected/RunCMakeTest.cmake | 1 |
6 files changed, 13 insertions, 1 deletions
diff --git a/Tests/RunCMake/CommandLine/C_buildsrcdir/initial-cache.txt b/Tests/RunCMake/CommandLine/C_buildsrcdir/initial-cache.txt index adc125ba20..ce1cce361a 100644 --- a/Tests/RunCMake/CommandLine/C_buildsrcdir/initial-cache.txt +++ b/Tests/RunCMake/CommandLine/C_buildsrcdir/initial-cache.txt @@ -1,3 +1,5 @@ +set(CMAKE_MINIMUM_REQUIRED_VERSION "" CACHE STRING "") + # Used to verify that the values match what is passed via -S and -B, and are retained in cache. set(INITIAL_SOURCE_DIR "${CMAKE_SOURCE_DIR}" CACHE PATH "defined in initial.cmake") set(INITIAL_BINARY_DIR "${CMAKE_BINARY_DIR}" CACHE PATH "defined in initial.cmake") diff --git a/Tests/RunCMake/project/CMakeLists.txt b/Tests/RunCMake/project/CMakeLists.txt index 4b3de84d94..fdcaee9c86 100644 --- a/Tests/RunCMake/project/CMakeLists.txt +++ b/Tests/RunCMake/project/CMakeLists.txt @@ -1,3 +1,5 @@ -cmake_minimum_required(VERSION 2.8.12) +if(NOT "x${RunCMake_TEST}" STREQUAL "xNoMinimumRequired") + cmake_minimum_required(VERSION 2.8.12) +endif() project(${RunCMake_TEST} NONE) include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/project/NoMinimumRequired-stderr.txt b/Tests/RunCMake/project/NoMinimumRequired-stderr.txt new file mode 100644 index 0000000000..83e2ac9d08 --- /dev/null +++ b/Tests/RunCMake/project/NoMinimumRequired-stderr.txt @@ -0,0 +1,5 @@ +CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\): + cmake_minimum_required\(\) should be called prior to this top-level project\(\) + call\. Please see the cmake-commands\(7\) manual for usage documentation of + both commands\. +This warning is for project developers\. Use -Wno-dev to suppress it\.$ diff --git a/Tests/RunCMake/project/NoMinimumRequired.cmake b/Tests/RunCMake/project/NoMinimumRequired.cmake new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/Tests/RunCMake/project/NoMinimumRequired.cmake diff --git a/Tests/RunCMake/project/RunCMakeTest.cmake b/Tests/RunCMake/project/RunCMakeTest.cmake index 6d9f52f51d..0f3716ff45 100644 --- a/Tests/RunCMake/project/RunCMakeTest.cmake +++ b/Tests/RunCMake/project/RunCMakeTest.cmake @@ -52,3 +52,5 @@ run_cmake(CMP0048-NEW) run_cmake(CMP0096-WARN) run_cmake(CMP0096-OLD) run_cmake(CMP0096-NEW) + +run_cmake(NoMinimumRequired) diff --git a/Tests/RunCMake/project_injected/RunCMakeTest.cmake b/Tests/RunCMake/project_injected/RunCMakeTest.cmake index ba1a003778..cf63e12d28 100644 --- a/Tests/RunCMake/project_injected/RunCMakeTest.cmake +++ b/Tests/RunCMake/project_injected/RunCMakeTest.cmake @@ -1,6 +1,7 @@ include(RunCMake) set(RunCMake_TEST_OPTIONS + -DCMAKE_MINIMUM_REQUIRED_VERSION:STATIC= # Simulate a previous CMake run that used `project(... VERSION ...)` # in a non-injected call site. -DCMAKE_PROJECT_VERSION:STATIC=1.2.3 |