diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-21 14:12:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-04-21 14:12:05 (GMT) |
| commit | df7590a2b96e6b3f8f1911e6679ddf53fc3f644c (patch) | |
| tree | b57187d86c13cd2f75953348287cd71d10f3a59f | |
| parent | 08c99c92532aaa54cf716ce07bc241ae1d2e997b (diff) | |
| parent | cda401fec495c0d086af3c6bb2b169bd95842ec0 (diff) | |
| download | CMake-df7590a2b96e6b3f8f1911e6679ddf53fc3f644c.zip CMake-df7590a2b96e6b3f8f1911e6679ddf53fc3f644c.tar.gz CMake-df7590a2b96e6b3f8f1911e6679ddf53fc3f644c.tar.bz2 | |
Merge branch 'fix-test-all-find-modules' into release
| -rw-r--r-- | Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tests/FindModulesExecuteAll/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt index 8f842d6..e6c5270 100644 --- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt @@ -1,10 +1,6 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required(VERSION 2.8.4) # new enough for CMP0017 project(AllFindModules) -if (POLICY CMP0017) - cmake_policy(SET CMP0017 NEW) -endif () - # Avoid ctest truncation of output message(STATUS "CTEST_FULL_OUTPUT") diff --git a/Tests/FindModulesExecuteAll/CMakeLists.txt b/Tests/FindModulesExecuteAll/CMakeLists.txt index 21b9d38..4893bb3 100644 --- a/Tests/FindModulesExecuteAll/CMakeLists.txt +++ b/Tests/FindModulesExecuteAll/CMakeLists.txt @@ -6,8 +6,8 @@ # # I guess more things could be added, like checking whether variables are # defined after running the modules (e.g. FOO_FOUND etc.). +cmake_minimum_required(VERSION 2.8.4) # new enough for CMP0017 project(FindModulesExecuteAll) -cmake_minimum_required(VERSION 2.7) file(GLOB all_modules "${CMAKE_CURRENT_SOURCE_DIR}/../../Modules/Find*cmake") |