diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-07-25 12:24:29 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2018-07-25 12:24:29 (GMT) |
| commit | 504129889335fc7680a7894bc85eaf60bffc880c (patch) | |
| tree | ecd0838d3dd95ca13082875a259c64fa1e8c6e3b /Tests/RunCMake | |
| parent | b5061e02f86e8d003d2f8c59d7fac22207dcd860 (diff) | |
| parent | 6646771b0f4f6ec71a5717a68f74c987eb399b4e (diff) | |
| download | CMake-504129889335fc7680a7894bc85eaf60bffc880c.zip CMake-504129889335fc7680a7894bc85eaf60bffc880c.tar.gz CMake-504129889335fc7680a7894bc85eaf60bffc880c.tar.bz2 | |
Merge branch 'project-injected-no-cmp0048' into release-3.12
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/project_injected/CMP0048-WARN.cmake | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/project_injected/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/project_injected/RunCMakeTest.cmake | 12 |
4 files changed, 16 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index bb46144..637c5c2 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -240,6 +240,7 @@ add_RunCMake_test(include_guard) add_RunCMake_test(list) add_RunCMake_test(message) add_RunCMake_test(project -DCMake_TEST_RESOURCES=${CMake_TEST_RESOURCES}) +add_RunCMake_test(project_injected) add_RunCMake_test(return) add_RunCMake_test(separate_arguments) add_RunCMake_test(set_property) diff --git a/Tests/RunCMake/project_injected/CMP0048-WARN.cmake b/Tests/RunCMake/project_injected/CMP0048-WARN.cmake new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Tests/RunCMake/project_injected/CMP0048-WARN.cmake diff --git a/Tests/RunCMake/project_injected/CMakeLists.txt b/Tests/RunCMake/project_injected/CMakeLists.txt new file mode 100644 index 0000000..1b4931b --- /dev/null +++ b/Tests/RunCMake/project_injected/CMakeLists.txt @@ -0,0 +1,3 @@ +cmake_minimum_required(VERSION 2.8.12.2) # old enough to not set CMP0048 +# no project(${RunCMake_TEST} NONE) +include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/project_injected/RunCMakeTest.cmake b/Tests/RunCMake/project_injected/RunCMakeTest.cmake new file mode 100644 index 0000000..ba1a003 --- /dev/null +++ b/Tests/RunCMake/project_injected/RunCMakeTest.cmake @@ -0,0 +1,12 @@ +include(RunCMake) + +set(RunCMake_TEST_OPTIONS + # Simulate a previous CMake run that used `project(... VERSION ...)` + # in a non-injected call site. + -DCMAKE_PROJECT_VERSION:STATIC=1.2.3 + -DCMAKE_PROJECT_VERSION_MAJOR:STATIC=1 + -DCMAKE_PROJECT_VERSION_MINOR:STATIC=2 + -DCMAKE_PROJECT_VERSION_PATCH:STATIC=3 + ) +run_cmake(CMP0048-WARN) +unset(RunCMake_TEST_OPTIONS) |