[Cmake-commits] CMake branch, next, updated. v2.8.4-1643-g66e0b0c
Clinton Stimpson
clinton at elemtech.com
Wed Jun 1 00:17:49 EDT 2011
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 66e0b0cde5c72eeaaceff445ec3b3d1fbb06de9d (commit)
via 900bf98d0103567aa51f0d1d2fc0f5d5eb67c124 (commit)
from 66f5ca07b1dfe4d5480c45851fae546b0ab2ff38 (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=66e0b0cde5c72eeaaceff445ec3b3d1fbb06de9d
commit 66e0b0cde5c72eeaaceff445ec3b3d1fbb06de9d
Merge: 66f5ca0 900bf98
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Jun 1 00:17:46 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 1 00:17:46 2011 -0400
Merge topic 'bundleutil-test-fix-bcc' into next
900bf98 BundleUtilities: Disable running test on Windows unless using MSVC.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=900bf98d0103567aa51f0d1d2fc0f5d5eb67c124
commit 900bf98d0103567aa51f0d1d2fc0f5d5eb67c124
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue May 31 22:15:34 2011 -0600
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue May 31 22:15:34 2011 -0600
BundleUtilities: Disable running test on Windows unless using MSVC.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 75ee7d9..d840b96 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -194,8 +194,8 @@ IF(BUILD_TESTING)
LIST(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
- # run test for BundleUtilities on supported platforms
- if(CMAKE_SYSTEM_NAME MATCHES "Windows" OR
+ # run test for BundleUtilities on supported platforms/compilers
+ if(MSVC OR
CMAKE_SYSTEM_NAME MATCHES "Linux" OR
CMAKE_SYSTEM_NAME MATCHES "Darwin")
ADD_TEST(BundleUtilities ${CMAKE_CTEST_COMMAND}
@@ -207,7 +207,7 @@ IF(BUILD_TESTING)
--build-project BundleUtilities
)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
- endif(CMAKE_SYSTEM_NAME MATCHES "Windows" OR
+ endif(MSVC OR
CMAKE_SYSTEM_NAME MATCHES "Linux" OR
CMAKE_SYSTEM_NAME MATCHES "Darwin")
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list