[Cmake-commits] CMake branch, next, updated. v2.8.9-1066-g2b2adae

[Brad King]

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  2b2adae33c6b9d1df06bd2db985296696af69f14 (commit)
       via  71491bbe8fd6e3ca83f9ed705c8c81f7ddaf9448 (commit)
       via  cf7b1d9f714251fbf1d9ad9536977c6d2fc11a14 (commit)
      from  3c0dbc64cbed9139211d7e851d988fd117dfcf74 (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=2b2adae33c6b9d1df06bd2db985296696af69f14
commit 2b2adae33c6b9d1df06bd2db985296696af69f14
Merge: 3c0dbc6 71491bb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 10 16:03:53 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 10 16:03:53 2012 -0400

    Merge topic 'FortranCInterface-verify-flags' into next
    
    71491bb FortranCInterface: Pass all flags to VERIFY project (#13579)
    cf7b1d9 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71491bbe8fd6e3ca83f9ed705c8c81f7ddaf9448
commit 71491bbe8fd6e3ca83f9ed705c8c81f7ddaf9448
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 10 15:38:36 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 10 15:42:55 2012 -0400

    FortranCInterface: Pass all flags to VERIFY project (#13579)
    
    Teach FortranCInterface_VERIFY to build the test project in a specific
    configuration and pass all flags for that configuration.  This ensures
    that any modifications made by the user or project to the flag are used in
    the test project consistently.

diff --git a/Modules/FortranCInterface.cmake b/Modules/FortranCInterface.cmake
index aafecb4..c59e1f8 100644
--- a/Modules/FortranCInterface.cmake
+++ b/Modules/FortranCInterface.cmake
@@ -61,7 +61,7 @@
 # If the check fails and QUIET is not given the function terminates
 # with a FATAL_ERROR message describing the problem.  The purpose of
 # this check is to stop a build early for incompatible compiler
-# combinations.
+# combinations.  The test is built in the Release configuration.
 #
 # FortranCInterface is aware of possible GLOBAL and MODULE manglings
 # for many Fortran compilers, but it also provides an interface to
@@ -250,6 +250,7 @@ function(FortranCInterface_VERIFY)
     message(STATUS "${_desc}")
 
     # Build a sample project which reports symbols.
+    set(CMAKE_TRY_COMPILE_CONFIGURATION Release)
     try_compile(FortranCInterface_VERIFY_${lang}_COMPILED
       ${FortranCInterface_BINARY_DIR}/Verify${lang}
       ${FortranCInterface_SOURCE_DIR}/Verify
@@ -259,6 +260,9 @@ function(FortranCInterface_VERIFY)
                  "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}"
                  "-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}"
                  "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}"
+                 "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}"
+                 "-DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}"
+                 "-DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE}"
       OUTPUT_VARIABLE _output)
     file(WRITE "${FortranCInterface_BINARY_DIR}/Verify${lang}/output.txt" "${_output}")
 

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

Summary of changes:
 Modules/FortranCInterface.cmake |    6 +++++-
 Source/CMakeVersion.cmake       |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake