From a4596f204822c91581ca69d513e0ed3638eee495 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 19 May 2015 12:54:53 -0400 Subject: CheckTypeSize: Do not use cmake_policy(VERSION) Do not force a specific policy version in the module because it prevents projects from setting newer policies to NEW. In particular, projects may want to set CMP0056 to NEW to affect any try_compile calls in this module. Use of this was added in commit v2.8.2~539 (New CheckTypeSize for OS X Universal Binaries, 2009-12-17) and updated in commit v3.1.0-rc1~511^2~1 (Do not change minimum required version in modules, 2014-05-07). The history does not clearly explain why a specific policy version was introduced. If specific policies need to be NEW then we can add explicit settings for them. --- Modules/CheckTypeSize.cmake | 1 - 1 file changed, 1 deletion(-) 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) -- cgit v0.12 From b3795df2f4e042f8db74a1d9024ca3d03eccea2d Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 19 May 2015 12:59:26 -0400 Subject: FortranCInterface: Do not use cmake_policy(VERSION) Do not force a specific policy version in the module because it prevents projects from setting newer policies to NEW. In particular, projects may want to set CMP0056 to NEW to affect any try_compile calls in this module. Use of this was added in commit v2.8.2~714 (FortranCInterface: Use CMake 2.8.0 behavior, 2009-11-17) in order to set CMP0007 to NEW. Simply set this policy explicitly instead. --- Modules/FortranCInterface.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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. -- cgit v0.12