[Cmake-commits] CMake branch, next, updated. v2.8.6-1763-gb46baba

[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  b46baba2aab2a9ef0fadfb5268a3c57f09fa5422 (commit)
       via  54595e6d89a6280dfbc9580500ce50283ce71d3f (commit)
      from  7b3c5866979e2b5c53f9dabafa1dfd330683294b (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=b46baba2aab2a9ef0fadfb5268a3c57f09fa5422
commit b46baba2aab2a9ef0fadfb5268a3c57f09fa5422
Merge: 7b3c586 54595e6
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Nov 1 16:40:44 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 1 16:40:44 2011 -0400

    Merge topic 'add-mfc-test' into next
    
    54595e6 Tests: Avoid MFC test automatically for VCExpress builds (#11213)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54595e6d89a6280dfbc9580500ce50283ce71d3f
commit 54595e6d89a6280dfbc9580500ce50283ce71d3f
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Nov 1 16:27:24 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Nov 1 16:27:24 2011 -0400

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

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f400f6d..27018d1 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1210,6 +1210,30 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     set(CTEST_RUN_MFC OFF)
     if(MSVC)
       set(CTEST_RUN_MFC ON)
+
+      # Look for evidence that this is a VCExpress build. If so, avoid
+      # the MFC test by default.
+      string(TOLOWER "${CMAKE_TEST_MAKEPROGRAM}" mkprog)
+      if(mkprog MATCHES "vcexpress")
+        message(STATUS
+          "CMAKE_TEST_MAKEPROGRAM indicates vcexpress, avoiding MFC test")
+        set(CTEST_RUN_MFC OFF)
+      endif()
+
+      # Since MSBuild might also be the "makeprogram" for a VCExpress
+      # build tree, use one more heuristic, too. The string representing
+      # the .vcproj file type contains "VCExpress" on machines where an
+      # express edition of VS was installed last:
+      if(CTEST_RUN_MFC)
+        execute_process(COMMAND cmd /c assoc .vcproj
+          OUTPUT_STRIP_TRAILING_WHITESPACE
+          OUTPUT_VARIABLE ov)
+        if(ov MATCHES "VCExpress")
+          message(STATUS
+            ".vcproj file association indicates VCExpress, avoiding MFC test")
+          set(CTEST_RUN_MFC OFF)
+        endif()
+      endif()
     endif()
   endif()
 

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

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


hooks/post-receive
-- 
CMake