[Cmake-commits] CMake branch, next, updated. v2.8.4-1683-g7a2a5c2

[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  7a2a5c2bdad1e9c7622d1abde9f85eaec3f852b1 (commit)
       via  51e16c05f7c4e70d8bbf97a13243b1f1cfffa2d7 (commit)
      from  427526a6dbb20c4c6b46b8db7aedfa1716726278 (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=7a2a5c2bdad1e9c7622d1abde9f85eaec3f852b1
commit 7a2a5c2bdad1e9c7622d1abde9f85eaec3f852b1
Merge: 427526a 51e16c0
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Sat Jun 4 19:55:34 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jun 4 19:55:34 2011 -0400

    Merge topic 'fix-12034-fixup-bundle-with-non-dotapp-exe' into next
    
    51e16c0 BundleUtilities: Avoid test on Watcom dashboards (#12034)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51e16c05f7c4e70d8bbf97a13243b1f1cfffa2d7
commit 51e16c05f7c4e70d8bbf97a13243b1f1cfffa2d7
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Sat Jun 4 19:52:45 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Sat Jun 4 19:54:49 2011 -0400

    BundleUtilities: Avoid test on Watcom dashboards (#12034)

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d840b96..8149847 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -198,6 +198,7 @@ IF(BUILD_TESTING)
   if(MSVC OR
      CMAKE_SYSTEM_NAME MATCHES "Linux" OR
      CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  if(NOT "${CMAKE_TEST_GENERATOR}" STREQUAL "Watcom WMake")
     ADD_TEST(BundleUtilities ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/BundleUtilities"
@@ -207,9 +208,8 @@ IF(BUILD_TESTING)
       --build-project BundleUtilities
       )
     LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
-  endif(MSVC OR
-     CMAKE_SYSTEM_NAME MATCHES "Linux" OR
-     CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  endif()
+  endif()
 
   SET(CMAKE_BUILD_TEST_SOURCE_DIR "${CMake_SOURCE_DIR}/Tests/COnly")
   SET(CMAKE_BUILD_TEST_BINARY_DIR "${CMake_BINARY_DIR}/Tests/CMakeBuildCOnly")

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

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


hooks/post-receive
-- 
CMake