diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-14 15:14:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-14 15:14:33 (GMT) |
| commit | 2389fcc677414b95667caa898e1b396e96b4bf3f (patch) | |
| tree | c508f826dcc109238cc97b2c5903abb819645989 /Tests | |
| parent | 1f0a695561f12b8e3929066d7dc61535a20af66c (diff) | |
| parent | 5108759ed2bb211105f02fcc857fc89f3db768f0 (diff) | |
| download | CMake-2389fcc677414b95667caa898e1b396e96b4bf3f.zip CMake-2389fcc677414b95667caa898e1b396e96b4bf3f.tar.gz CMake-2389fcc677414b95667caa898e1b396e96b4bf3f.tar.bz2 | |
Merge topic 'find-boost-cmp0093'
5108759ed2 FindBoost: Introduce CMP0093 to report Boost_VERSION in x.y.z format
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3317
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/FindBoost/CMP0093-NEW-stdout.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/FindBoost/CMP0093-NEW.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/FindBoost/CMP0093-OLD-stdout.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/FindBoost/CMP0093-OLD.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/FindBoost/CMP0093-UNSET-stdout.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/FindBoost/CMP0093-UNSET.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/FindBoost/RunCMakeTest.cmake | 4 |
7 files changed, 12 insertions, 0 deletions
diff --git a/Tests/RunCMake/FindBoost/CMP0093-NEW-stdout.txt b/Tests/RunCMake/FindBoost/CMP0093-NEW-stdout.txt new file mode 100644 index 0000000..62a6d39 --- /dev/null +++ b/Tests/RunCMake/FindBoost/CMP0093-NEW-stdout.txt @@ -0,0 +1 @@ +-- Boost_VERSION=1.70.0 diff --git a/Tests/RunCMake/FindBoost/CMP0093-NEW.cmake b/Tests/RunCMake/FindBoost/CMP0093-NEW.cmake new file mode 100644 index 0000000..64f44d2 --- /dev/null +++ b/Tests/RunCMake/FindBoost/CMP0093-NEW.cmake @@ -0,0 +1,2 @@ +cmake_policy(SET CMP0093 NEW) +include(ModuleMode.cmake) diff --git a/Tests/RunCMake/FindBoost/CMP0093-OLD-stdout.txt b/Tests/RunCMake/FindBoost/CMP0093-OLD-stdout.txt new file mode 100644 index 0000000..9e51e35 --- /dev/null +++ b/Tests/RunCMake/FindBoost/CMP0093-OLD-stdout.txt @@ -0,0 +1 @@ +-- Boost_VERSION=107000 diff --git a/Tests/RunCMake/FindBoost/CMP0093-OLD.cmake b/Tests/RunCMake/FindBoost/CMP0093-OLD.cmake new file mode 100644 index 0000000..69a3a95 --- /dev/null +++ b/Tests/RunCMake/FindBoost/CMP0093-OLD.cmake @@ -0,0 +1,2 @@ +cmake_policy(SET CMP0093 OLD) +include(ModuleMode.cmake) diff --git a/Tests/RunCMake/FindBoost/CMP0093-UNSET-stdout.txt b/Tests/RunCMake/FindBoost/CMP0093-UNSET-stdout.txt new file mode 100644 index 0000000..9e51e35 --- /dev/null +++ b/Tests/RunCMake/FindBoost/CMP0093-UNSET-stdout.txt @@ -0,0 +1 @@ +-- Boost_VERSION=107000 diff --git a/Tests/RunCMake/FindBoost/CMP0093-UNSET.cmake b/Tests/RunCMake/FindBoost/CMP0093-UNSET.cmake new file mode 100644 index 0000000..974094a --- /dev/null +++ b/Tests/RunCMake/FindBoost/CMP0093-UNSET.cmake @@ -0,0 +1 @@ +include(ModuleMode.cmake) diff --git a/Tests/RunCMake/FindBoost/RunCMakeTest.cmake b/Tests/RunCMake/FindBoost/RunCMakeTest.cmake index d66bda1..3916890 100644 --- a/Tests/RunCMake/FindBoost/RunCMakeTest.cmake +++ b/Tests/RunCMake/FindBoost/RunCMakeTest.cmake @@ -14,3 +14,7 @@ run_cmake(ConfigModeNotFound) run_cmake(ModuleModeNotFound) unset(RunCMake-stdout-file) unset(RunCMake-stderr-file) + +run_cmake(CMP0093-NEW) +run_cmake(CMP0093-OLD) +run_cmake(CMP0093-UNSET) |