summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-05-21 13:03:38 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-05-21 13:03:38 (GMT)
commit41d833e1e9decb422c019f16626fe61e38c03eec (patch)
tree3e32d0004d09fca0e4b2350b62ece77c0d4bd5ee /Modules
parenta696974298aebdf5b618ce981a4a355a872d474e (diff)
parentb3795df2f4e042f8db74a1d9024ca3d03eccea2d (diff)
downloadCMake-41d833e1e9decb422c019f16626fe61e38c03eec.zip
CMake-41d833e1e9decb422c019f16626fe61e38c03eec.tar.gz
CMake-41d833e1e9decb422c019f16626fe61e38c03eec.tar.bz2
Merge topic 'cleanup-module-policies'
b3795df2 FortranCInterface: Do not use cmake_policy(VERSION) a4596f20 CheckTypeSize: Do not use cmake_policy(VERSION)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CheckTypeSize.cmake1
-rw-r--r--Modules/FortranCInterface.cmake3
2 files changed, 1 insertions, 3 deletions
diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index 8c7acb5..5938d6c 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -82,7 +82,6 @@ include(CheckIncludeFile)
include(CheckIncludeFileCXX)
cmake_policy(PUSH)
-cmake_policy(VERSION 3.0)
cmake_policy(SET CMP0054 NEW)
get_filename_component(__check_type_size_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
diff --git a/Modules/FortranCInterface.cmake b/Modules/FortranCInterface.cmake
index 27f8a82..70c3fd7 100644
--- a/Modules/FortranCInterface.cmake
+++ b/Modules/FortranCInterface.cmake
@@ -144,9 +144,8 @@ if(FortranCInterface_SOURCE_DIR)
return()
endif()
-# Use CMake 2.8.0 behavior for this module regardless of including context.
cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.0)
+cmake_policy(SET CMP0007 NEW)
#-----------------------------------------------------------------------------
# Verify that C and Fortran are available.