[Cmake-commits] CMake branch, next, updated. v3.2.2-2971-gad005f8
Brad King
brad.king at kitware.com
Tue May 19 13:08:42 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via ad005f812a454356e78def29b48647d50fbb1753 (commit)
via b3795df2f4e042f8db74a1d9024ca3d03eccea2d (commit)
via a4596f204822c91581ca69d513e0ed3638eee495 (commit)
from 56e20260aa6862f8b049a09be9ecfc068f2c217c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad005f812a454356e78def29b48647d50fbb1753
commit ad005f812a454356e78def29b48647d50fbb1753
Merge: 56e2026 b3795df
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 19 13:08:41 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 19 13:08:41 2015 -0400
Merge topic 'cleanup-module-policies' into next
b3795df2 FortranCInterface: Do not use cmake_policy(VERSION)
a4596f20 CheckTypeSize: Do not use cmake_policy(VERSION)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3795df2f4e042f8db74a1d9024ca3d03eccea2d
commit b3795df2f4e042f8db74a1d9024ca3d03eccea2d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 19 12:59:26 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 19 13:00:38 2015 -0400
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.
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.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4596f204822c91581ca69d513e0ed3638eee495
commit a4596f204822c91581ca69d513e0ed3638eee495
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 19 12:54:53 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 19 12:56:07 2015 -0400
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.
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)
-----------------------------------------------------------------------
Summary of changes:
Modules/CheckTypeSize.cmake | 1 -
Modules/FortranCInterface.cmake | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list