Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 19:08:07 +08:00
Code Issues Projects Releases Wiki Activity

Merge topic 'fix-test-all-find-modules'

Browse Source 
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
This commit is contained in:
Brad King
2017-04-24 13:33:59 +00:00
committed by Kitware Robot
parent 1e31359565 cda401fec4
commit aaeb01ef9b
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/CMakeOnly/AllFindModules/CMakeLists.txt
View File

@@ -1,10 +1,6 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required(VERSION 2.8.4) # new enough for CMP0017
project(AllFindModules) project(AllFindModules)
if (POLICY CMP0017)
cmake_policy(SET CMP0017 NEW)
endif ()
# Avoid ctest truncation of output # Avoid ctest truncation of output
message(STATUS "CTEST_FULL_OUTPUT") message(STATUS "CTEST_FULL_OUTPUT")

2
Tests/FindModulesExecuteAll/CMakeLists.txt
View File

@@ -6,8 +6,8 @@
# #
# I guess more things could be added, like checking whether variables are # I guess more things could be added, like checking whether variables are
# defined after running the modules (e.g. FOO_FOUND etc.). # defined after running the modules (e.g. FOO_FOUND etc.).
cmake_minimum_required(VERSION 2.8.4) # new enough for CMP0017
project(FindModulesExecuteAll) project(FindModulesExecuteAll)
cmake_minimum_required(VERSION 2.7)
file(GLOB all_modules "${CMAKE_CURRENT_SOURCE_DIR}/../../Modules/Find*cmake") file(GLOB all_modules "${CMAKE_CURRENT_SOURCE_DIR}/../../Modules/Find*cmake")