From 1a2ede17643e7696aaad0dc2d6027f2049d4e06e Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 21 Apr 2017 09:23:11 -0400 Subject: Tests: Fix FindModulesExecuteAll when KDE4 is installed Set `CMP0017` to `NEW` so that when FindKDE4 sets `CMAKE_MODULE_PATH` it does not break internal dependencies of other find modules. Fixes: #16823 --- Tests/FindModulesExecuteAll/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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") -- cgit v0.12 From cda401fec495c0d086af3c6bb2b169bd95842ec0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 21 Apr 2017 09:25:04 -0400 Subject: Tests: Simplify CMakeOnly.AllFindModules policy settings --- Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 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") -- cgit v0.12