[Cmake-commits] CMake branch, next, updated. v2.8.7-1987-gd5a07b3
Bill Hoffman
bill.hoffman at kitware.com
Fri Jan 6 16:49:45 EST 2012
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 d5a07b316925816e345f9ce2452d2ea47c33d1c0 (commit)
via 42f893d9b4403f12fe8a08b1827673b72715ea42 (commit)
from cd3c3977ccfc2b4faffa4089081e9ea357f96d60 (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=d5a07b316925816e345f9ce2452d2ea47c33d1c0
commit d5a07b316925816e345f9ce2452d2ea47c33d1c0
Merge: cd3c397 42f893d
Author: Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jan 6 16:49:10 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 6 16:49:10 2012 -0500
Merge topic 'cmake_add_fortran_subdirectory' into next
42f893d Disable VSGNUFortran test with lsb and ifort compiler
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42f893d9b4403f12fe8a08b1827673b72715ea42
commit 42f893d9b4403f12fe8a08b1827673b72715ea42
Author: Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jan 6 16:48:36 2012 -0500
Commit: Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Jan 6 16:48:36 2012 -0500
Disable VSGNUFortran test with lsb and ifort compiler
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index a1d2fcf..ed9a73c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -179,6 +179,10 @@ IF(BUILD_TESTING)
SET(CMAKE_SKIP_VSGNUFortran TRUE)
ENDIF()
ENDIF()
+ IF((CMAKE_C_COMPILER MATCHS lsb) AND (CMAKE_Fortran_COMPILER MATCHES ifort))
+ MESSAGE(STATUS "Skip VSGNUFortran for ifort and lsb compilers")
+ SET(CMAKE_SKIP_VSGNUFortran TRUE)
+ ENDIF()
IF(NOT CMAKE_SKIP_VSGNUFortran)
ADD_TEST_MACRO(VSGNUFortran ${CMAKE_COMMAND} -P runtest.cmake)
ENDIF()
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list