[Cmake-commits] CMake branch, next, updated. v3.0.1-4854-g3ff95a9
Brad King
brad.king at kitware.com
Tue Aug 12 09:45:15 EDT 2014
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 3ff95a9e0cfc1d0f4a9ecfbd4a0845fd6e04b934 (commit)
via 33d0f64a44f30c5630e80cb265266349cfd11dbb (commit)
from dcd9e9671e260bf7453bde45cf8205d9808640cb (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=3ff95a9e0cfc1d0f4a9ecfbd4a0845fd6e04b934
commit 3ff95a9e0cfc1d0f4a9ecfbd4a0845fd6e04b934
Merge: dcd9e96 33d0f64
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 12 09:45:14 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 12 09:45:14 2014 -0400
Merge topic 'add-CheckFortranSourceCompiles' into next
33d0f64a Tests/FortranOnly: Print CMakeError.log on HAVE_PRINT failure
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33d0f64a44f30c5630e80cb265266349cfd11dbb
commit 33d0f64a44f30c5630e80cb265266349cfd11dbb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 12 09:46:04 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 12 09:46:04 2014 -0400
Tests/FortranOnly: Print CMakeError.log on HAVE_PRINT failure
diff --git a/Tests/FortranOnly/CMakeLists.txt b/Tests/FortranOnly/CMakeLists.txt
index ef151d7..da6a7dd 100644
--- a/Tests/FortranOnly/CMakeLists.txt
+++ b/Tests/FortranOnly/CMakeLists.txt
@@ -44,6 +44,8 @@ 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([[
@@ -52,5 +54,10 @@ CHECK_Fortran_SOURCE_COMPILES([[
END
]] HAVE_PRINT)
if(NOT HAVE_PRINT)
- message(SEND_ERROR "CHECK_Fortran_SOURCE_COMPILES for HAVE_PRINT failed!")
+ 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()
-----------------------------------------------------------------------
Summary of changes:
Tests/FortranOnly/CMakeLists.txt | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list