[Cmake-commits] CMake branch, next, updated. v2.8.10.1-859-gc9b45a6

[Brad King]

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  c9b45a67ec6c7665563103de782241131e96873e (commit)
       via  739f16653d823ea9519405da837cd57dcf204403 (commit)
      from  8bdaf566746208107013f6b04adc68e5bb4ec11b (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=c9b45a67ec6c7665563103de782241131e96873e
commit c9b45a67ec6c7665563103de782241131e96873e
Merge: 8bdaf56 739f166
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 13 10:53:43 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 13 10:53:43 2012 -0500

    Merge topic 'per-config-EXCLUDE_FROM_DEFAULT_BUILD' into next
    
    739f166 Serialize tests for EXCLUDE_FROM_DEFAULT_BUILD


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=739f16653d823ea9519405da837cd57dcf204403
commit 739f16653d823ea9519405da837cd57dcf204403
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 13 10:52:05 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 13 10:52:05 2012 -0500

    Serialize tests for EXCLUDE_FROM_DEFAULT_BUILD
    
    The tests share a single build directory and so should not run in
    parallel.  While at it, add the build dir to the test_clean target.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7f05121..1e8c228 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1417,6 +1417,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
       # The test (and tested property) works with .sln files, so it's skipped when:
       # * Using VS6, which doesn't use .sln files
       # * cmake --build is set up to use MSBuild, since the MSBuild invocation does not use the .sln file
+      set(_last_test "")
       foreach(config ${CMAKE_CONFIGURATION_TYPES})
         add_test(NAME VSExcludeFromDefaultBuild-${config} COMMAND ${CMAKE_CTEST_COMMAND}
           --build-and-test
@@ -1432,7 +1433,13 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
              -D "allConfigs=${CMAKE_CONFIGURATION_TYPES}"
              -D "dir=${CMake_BINARY_DIR}/Tests/VSExcludeFromDefaultBuild"
              -P "${CMake_SOURCE_DIR}/Tests/VSExcludeFromDefaultBuild/ResultTest.cmake")
+        if(_last_test)
+          set_property(TEST VSExcludeFromDefaultBuild-${config} PROPERTY DEPENDS ${_last_test})
+        endif()
+        set(_last_test "VSExcludeFromDefaultBuild-${config}")
       endforeach()
+      unset(_last_test)
+      list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/VSExcludeFromDefaultBuild")
     endif()
   endif()
 

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

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


hooks/post-receive
-- 
CMake