[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3362-g54a2f2e

Brad King brad.king at kitware.com
Thu Jul 25 08:27:05 EDT 2013


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  54a2f2e64b110451e3d497aee85142e13b273e24 (commit)
       via  3e79d656dae810d501054ccaecf918e4c84318ef (commit)
      from  b73584429405d585be416d7cf0257844fc8e0047 (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=54a2f2e64b110451e3d497aee85142e13b273e24
commit 54a2f2e64b110451e3d497aee85142e13b273e24
Merge: b735844 3e79d65
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 25 08:27:03 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 25 08:27:03 2013 -0400

    Merge topic 'doc-check-compiler-flag-override' into next
    
    3e79d65 Check*CompilerFlag: Document use of CMAKE_REQUIRED_DEFINITIONS (#14309)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e79d656dae810d501054ccaecf918e4c84318ef
commit 3e79d656dae810d501054ccaecf918e4c84318ef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 25 08:25:15 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 25 08:25:15 2013 -0400

    Check*CompilerFlag: Document use of CMAKE_REQUIRED_DEFINITIONS (#14309)
    
    Explain how CMAKE_REQUIRED_DEFINITIONS is set before calling the
    check_*_source_compiles macros.

diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake
index 02f7cb6..2213acc 100644
--- a/Modules/CheckCCompilerFlag.cmake
+++ b/Modules/CheckCCompilerFlag.cmake
@@ -2,9 +2,10 @@
 # CHECK_C_COMPILER_FLAG(<flag> <var>)
 #  <flag> - the compiler flag
 #  <var>  - variable to store the result
-# This internally calls the check_c_source_compiles macro.
+# This internally calls the check_c_source_compiles macro and
+# sets CMAKE_REQUIRED_DEFINITIONS to <flag>.
 # See help for CheckCSourceCompiles for a listing of variables
-# that can modify the build.
+# that can otherwise modify the build.
 
 #=============================================================================
 # Copyright 2006-2011 Kitware, Inc.
diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake
index a872a75..5e8db03 100644
--- a/Modules/CheckCXXCompilerFlag.cmake
+++ b/Modules/CheckCXXCompilerFlag.cmake
@@ -2,9 +2,10 @@
 # CHECK_CXX_COMPILER_FLAG(<flag> <var>)
 #  <flag> - the compiler flag
 #  <var>  - variable to store the result
-# This internally calls the check_cxx_source_compiles macro.  See help
-# for CheckCXXSourceCompiles for a listing of variables that can
-# modify the build.
+# This internally calls the check_cxx_source_compiles macro and
+# sets CMAKE_REQUIRED_DEFINITIONS to <flag>.
+# See help for CheckCXXSourceCompiles for a listing of variables
+# that can otherwise modify the build.
 
 #=============================================================================
 # Copyright 2006-2010 Kitware, Inc.

-----------------------------------------------------------------------

Summary of changes:
 Modules/CheckCCompilerFlag.cmake   |    5 +++--
 Modules/CheckCXXCompilerFlag.cmake |    7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list