[Cmake-commits] CMake branch, next, updated. v2.8.6-2271-gb670a6f

[Bill Hoffman]

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  b670a6f849521b3e112106a5601d0c6bcbe96715 (commit)
       via  32c3d6d2641af12b2375c9511fbbabf4b27bac95 (commit)
      from  c6f29bbed622262bde647813f68fc55df24f1f51 (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=b670a6f849521b3e112106a5601d0c6bcbe96715
commit b670a6f849521b3e112106a5601d0c6bcbe96715
Merge: c6f29bb 32c3d6d
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Dec 16 18:21:32 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 16 18:21:32 2011 -0500

    Merge topic 'cmake_add_fortran_subdirectory' into next
    
    32c3d6d Disable VSGNUFortran test on mac with universal bin and ifort.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32c3d6d2641af12b2375c9511fbbabf4b27bac95
commit 32c3d6d2641af12b2375c9511fbbabf4b27bac95
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Dec 16 18:20:46 2011 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Dec 16 18:20:46 2011 -0500

    Disable VSGNUFortran test on mac with universal bin and ifort.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 83a2312..a1d2fcf 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -169,7 +169,19 @@ IF(BUILD_TESTING)
   # or in some cases you might need to set the PATH so that cmake can find
   # the gfortran from mingw.
   IF(CMAKE_Fortran_COMPILER OR CMAKE_TEST_CMAKE_ADD_FORTRAN)
-    ADD_TEST_MACRO(VSGNUFortran ${CMAKE_COMMAND} -P runtest.cmake)
+    SET(CMAKE_SKIP_VSGNUFortran FALSE)
+    # disable test for apple builds using ifort if they are building
+    # more than one architecture, as ifort does not support that.
+    IF(APPLE AND (CMAKE_Fortran_COMPILER MATCHES ifort))
+      LIST(LENGTH CMAKE_OSX_ARCHITECTURES len)
+      IF("${len}" GREATER 1)
+        MESSAGE(STATUS "Skip VSGNUFortran for ifort dual cpu mac build")
+        SET(CMAKE_SKIP_VSGNUFortran TRUE)
+      ENDIF()
+    ENDIF()
+    IF(NOT CMAKE_SKIP_VSGNUFortran)
+      ADD_TEST_MACRO(VSGNUFortran ${CMAKE_COMMAND} -P runtest.cmake)
+    ENDIF()
   ENDIF()
   ADD_TEST_MACRO(COnly COnly)
   ADD_TEST_MACRO(CxxOnly CxxOnly)

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

Summary of changes:
 Tests/CMakeLists.txt |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake