[Cmake-commits] CMake branch, next, updated. v2.8.6-1789-g5b3cf73

[David Cole]

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  5b3cf735a66f84ab373359f6ea3b0d93ec71eb37 (commit)
       via  c71f7ab7db843234cab7e6b75ab2636a0d7e8d67 (commit)
      from  f83644187bcb776e4f416d7ddcd2a0cc19d1e6a9 (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=5b3cf735a66f84ab373359f6ea3b0d93ec71eb37
commit 5b3cf735a66f84ab373359f6ea3b0d93ec71eb37
Merge: f836441 c71f7ab
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Nov 3 13:21:39 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 3 13:21:39 2011 -0400

    Merge topic 'add-mfc-test' into next
    
    c71f7ab Tests: Avoid MFC test automatically for Watcom WMake builds (#11213)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c71f7ab7db843234cab7e6b75ab2636a0d7e8d67
commit c71f7ab7db843234cab7e6b75ab2636a0d7e8d67
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Nov 3 13:21:06 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Nov 3 13:21:06 2011 -0400

    Tests: Avoid MFC test automatically for Watcom WMake builds (#11213)

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 27018d1..cfc59be 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1208,6 +1208,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
 
   if(NOT DEFINED CTEST_RUN_MFC)
     set(CTEST_RUN_MFC OFF)
+
     if(MSVC)
       set(CTEST_RUN_MFC ON)
 
@@ -1234,6 +1235,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
           set(CTEST_RUN_MFC OFF)
         endif()
       endif()
+
+      # For the Watcom WMake generator, avoid the MFC test by default.
+      if(CTEST_RUN_MFC)
+        if("${CMAKE_TEST_GENERATOR}" MATCHES "WMake")
+          message(STATUS
+            "using the Watcom WMake generator, avoiding MFC test")
+          set(CTEST_RUN_MFC OFF)
+        endif()
+      endif()
     endif()
   endif()
 

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

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


hooks/post-receive
-- 
CMake