diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-24 13:33:59 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-24 09:34:03 -0400 |
| commit | aaeb01ef9bfa600e072be79792be53186c395a8c (patch) | |
| tree | 7b9cb1faff60a9f6f67225c28c89415c662e9591 /Tests | |
| parent | 1e31359565ddfb3d2f5ec13d5aa48467c4ec5a77 (diff) | |
| parent | cda401fec495c0d086af3c6bb2b169bd95842ec0 (diff) | |
| download | cmake-aaeb01ef9bfa600e072be79792be53186c395a8c.tar.gz | |
Merge topic 'fix-test-all-find-modules'
cda401fe Tests: Simplify CMakeOnly.AllFindModules policy settings
1a2ede17 Tests: Fix FindModulesExecuteAll when KDE4 is installed
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !736
Diffstat (limited to 'Tests')
| -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 7eb679c9d4..443d366c43 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 21b9d3897f..4893bb3358 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") |