[Cmake-commits] CMake branch, next, updated. v3.0.1-4889-gc4cf702

[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  c4cf702d727cb140986b2c21e67470457849f791 (commit)
       via  95dffb06af904c13692b9295daac036aef5ce9db (commit)
      from  3f66f2fbe8f6c27d4bf541fa32c91582f7078174 (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=c4cf702d727cb140986b2c21e67470457849f791
commit c4cf702d727cb140986b2c21e67470457849f791
Merge: 3f66f2f 95dffb0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 13 09:19:15 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 13 09:19:15 2014 -0400

    Merge topic 'add-CheckFortranSourceCompiles' into next
    
    95dffb06 Tests/FortranOnly: Exclude failing portion of test on IBM XL Fortran


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95dffb06af904c13692b9295daac036aef5ce9db
commit 95dffb06af904c13692b9295daac036aef5ce9db
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 13 09:20:07 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 13 09:20:07 2014 -0400

    Tests/FortranOnly: Exclude failing portion of test on IBM XL Fortran

diff --git a/Tests/FortranOnly/CMakeLists.txt b/Tests/FortranOnly/CMakeLists.txt
index da6a7dd..a3f83c9 100644
--- a/Tests/FortranOnly/CMakeLists.txt
+++ b/Tests/FortranOnly/CMakeLists.txt
@@ -44,20 +44,24 @@ add_custom_target(checksayhello ALL
   )
 add_dependencies(checksayhello sayhello)
 
-set(err_log ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log)
-file(REMOVE "${err_log}")
-include(CheckFortranSourceCompiles)
-unset(HAVE_PRINT CACHE)
-CHECK_Fortran_SOURCE_COMPILES([[
+# Exclude this test on IBM XL for now because the check strangely
+# fails with 'ld: 0706-029 Use a number with the -H flag'.
+if(NOT CMAKE_Fortran_COMPILER_ID STREQUAL XL)
+  set(err_log ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log)
+  file(REMOVE "${err_log}")
+  include(CheckFortranSourceCompiles)
+  unset(HAVE_PRINT CACHE)
+  CHECK_Fortran_SOURCE_COMPILES([[
       PROGRAM TEST_HAVE_PRINT
         PRINT *, 'Hello'
       END
 ]] HAVE_PRINT)
-if(NOT HAVE_PRINT)
-  if(EXISTS "${err_log}")
-    file(READ "${err_log}" err)
+  if(NOT HAVE_PRINT)
+    if(EXISTS "${err_log}")
+      file(READ "${err_log}" err)
+    endif()
+    string(REPLACE "\n" "\n  " err "  ${err}")
+    message(SEND_ERROR "CHECK_Fortran_SOURCE_COMPILES for HAVE_PRINT failed:\n"
+      "${err}")
   endif()
-  string(REPLACE "\n" "\n  " err "  ${err}")
-  message(SEND_ERROR "CHECK_Fortran_SOURCE_COMPILES for HAVE_PRINT failed:\n"
-    "${err}")
 endif()

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

Summary of changes:
 Tests/FortranOnly/CMakeLists.txt |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake