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 bc419fa05ee44b12ace8db8dd1eab1615eaf82d4 (commit) via ce40a377935cd05e50230d844f2fe579ef5dfb41 (commit) from f13f913f7cbde7616e2a2fc2209e087967ecba58 (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=bc419fa05ee44b12ace8db8dd1eab1615eaf82d4 commit bc419fa05ee44b12ace8db8dd1eab1615eaf82d4 Merge: f13f913 ce40a37 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Aug 20 10:19:28 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Aug 20 10:19:28 2014 -0400 Merge topic 'vs-masm' into next ce40a377 VS: Skip MASM test on MSVC 13.0 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce40a377935cd05e50230d844f2fe579ef5dfb41 commit ce40a377935cd05e50230d844f2fe579ef5dfb41 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Aug 20 10:19:00 2014 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Aug 20 10:19:00 2014 -0400 VS: Skip MASM test on MSVC 13.0 diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 48e1c82..f237f21 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1679,7 +1679,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/MFC") endif() - if(MSVC AND NOT MSVC_VERSION LESS 1300 + if(MSVC AND NOT MSVC_VERSION LESS 1310 AND NOT CMAKE_GENERATOR MATCHES "Visual Studio [6789]( |$)") ADD_TEST_MACRO(VSMASM VSMASM) endif() ----------------------------------------------------------------------- Summary of changes: Tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits