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 9245b5e072560f07e1b11c2341caeee386812086 (commit)
via ac954553d814ddc7371f853787cbc29ab2060a0a (commit)
from 0a956ea9e6bd8b8d381f097b82ced12b60cef906 (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=9245b5e072560f07e1b11c2341caeee386812086
commit 9245b5e072560f07e1b11c2341caeee386812086
Merge: 0a956ea ac95455
Author: Daniele E. Domenichelli <daniele.domeniche...@gmail.com>
AuthorDate: Thu Dec 5 04:02:01 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Dec 5 04:02:01 2013 -0500
Merge topic 'ExternalProject-independent-step-targets' into next
ac95455 ExternalProject: Fix tests with ninja
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac954553d814ddc7371f853787cbc29ab2060a0a
commit ac954553d814ddc7371f853787cbc29ab2060a0a
Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
AuthorDate: Thu Dec 5 09:58:22 2013 +0100
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Thu Dec 5 09:58:28 2013 +0100
ExternalProject: Fix tests with ninja
Update step for external projects depending on "SetupLocal*Repository"
is not supposed to be independent, otherwise with parallel builds the
update step might be executed before the repository is ready.
diff --git a/Tests/ExternalProject/CMakeLists.txt
b/Tests/ExternalProject/CMakeLists.txt
index e22d84a..b4dca29 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -309,6 +309,7 @@ if(do_cvs_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalCVSRepository"
+ INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "CVS")
@@ -324,6 +325,7 @@ if(do_cvs_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalCVSRepository"
+ INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "CVS")
@@ -344,6 +346,7 @@ if(do_cvs_tests)
DEPENDS "TutorialStep1-LocalNoDirTGZ"
DEPENDS "TutorialStep1-CVS-20090626"
DEPENDS "TutorialStep1-CVS-testtag1"
+ INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "CVS")
endif()
@@ -405,6 +408,7 @@ if(do_svn_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalSVNRepository"
+ INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "SVN")
@@ -419,6 +423,7 @@ if(do_svn_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalSVNRepository"
+ INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "SVN")
@@ -431,6 +436,7 @@ if(do_svn_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalSVNRepository"
+ INDEPENDENT_STEP_TARGETS ""
LOG_DOWNLOAD 1
)
set_property(TARGET ${proj} PROPERTY FOLDER "SVN")
@@ -485,6 +491,7 @@ if(do_git_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalGITRepository"
+ INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
@@ -499,6 +506,7 @@ if(do_git_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalGITRepository"
+ INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
@@ -511,6 +519,7 @@ if(do_git_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalGITRepository"
+ INDEPENDENT_STEP_TARGETS ""
LOG_UPDATE 1
)
set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
@@ -551,6 +560,7 @@ if(do_hg_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalHGRepository"
+ INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "HG")
@@ -565,6 +575,7 @@ if(do_hg_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalHGRepository"
+ INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "HG")
@@ -580,6 +591,7 @@ if(do_hg_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalHGRepository"
+ INDEPENDENT_STEP_TARGETS ""
LOG_UPDATE 1
)
set_property(TARGET ${proj} PROPERTY FOLDER "HG")
-----------------------------------------------------------------------
Summary of changes:
Tests/ExternalProject/CMakeLists.txt | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
