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 2f5bb2df18b65553041433ca34ad84a65d34e9c5 (commit) via 2314115b3d612a8e2f501276b32c80bcad144f06 (commit) via 1d2eb8729d1f61ab2eee8253d4243dd69e9175a9 (commit) from 6568c4a37ec615e5a3dc4908377ad5dfd6661bde (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=2f5bb2df18b65553041433ca34ad84a65d34e9c5 commit 2f5bb2df18b65553041433ca34ad84a65d34e9c5 Merge: 6568c4a 2314115 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Tue Aug 6 16:10:58 2013 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Aug 6 16:10:58 2013 -0400 Merge topic 'dev/fix-variable-watch-crash' into next 2314115 Fix style in destructor 1d2eb87 Merge WatchTwice into existing variable_watch test http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2314115b3d612a8e2f501276b32c80bcad144f06 commit 2314115b3d612a8e2f501276b32c80bcad144f06 Author: Ben Boeckel <maths...@gmail.com> AuthorDate: Tue Aug 6 15:17:55 2013 -0400 Commit: Ben Boeckel <maths...@gmail.com> CommitDate: Tue Aug 6 16:10:32 2013 -0400 Fix style in destructor diff --git a/Source/cmVariableWatchCommand.cxx b/Source/cmVariableWatchCommand.cxx index bd161f9..4eff19e 100644 --- a/Source/cmVariableWatchCommand.cxx +++ b/Source/cmVariableWatchCommand.cxx @@ -104,7 +104,8 @@ cmVariableWatchCommand::cmVariableWatchCommand() cmVariableWatchCommand::~cmVariableWatchCommand() { std::set<std::string>::const_iterator it; - for ( it = this->WatchedVariables.begin(); it != this->WatchedVariables.end(); + for ( it = this->WatchedVariables.begin(); + it != this->WatchedVariables.end(); ++it ) { this->Makefile->GetCMakeInstance()->GetVariableWatch()->RemoveWatch( http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d2eb8729d1f61ab2eee8253d4243dd69e9175a9 commit 1d2eb8729d1f61ab2eee8253d4243dd69e9175a9 Author: Ben Boeckel <maths...@gmail.com> AuthorDate: Tue Aug 6 14:40:33 2013 -0400 Commit: Ben Boeckel <maths...@gmail.com> CommitDate: Tue Aug 6 14:40:33 2013 -0400 Merge WatchTwice into existing variable_watch test diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 367c2b9..6d1bca2 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -117,4 +117,3 @@ endif() add_RunCMake_test(File_Generate) add_RunCMake_test(ExportWithoutLanguage) add_RunCMake_test(target_link_libraries) -add_RunCMake_test(WatchTwice) diff --git a/Tests/RunCMake/WatchTwice/CMakeLists.txt b/Tests/RunCMake/WatchTwice/CMakeLists.txt deleted file mode 100644 index e8db6b0..0000000 --- a/Tests/RunCMake/WatchTwice/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -cmake_minimum_required(VERSION 2.8) -project(${RunCMake_TEST} NONE) -include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/WatchTwice/RunCMakeTest.cmake b/Tests/RunCMake/WatchTwice/RunCMakeTest.cmake deleted file mode 100644 index 19205b2..0000000 --- a/Tests/RunCMake/WatchTwice/RunCMakeTest.cmake +++ /dev/null @@ -1,3 +0,0 @@ -include(RunCMake) - -run_cmake(WatchTwice) diff --git a/Tests/RunCMake/variable_watch/RunCMakeTest.cmake b/Tests/RunCMake/variable_watch/RunCMakeTest.cmake index 8d20476..9becb4c 100644 --- a/Tests/RunCMake/variable_watch/RunCMakeTest.cmake +++ b/Tests/RunCMake/variable_watch/RunCMakeTest.cmake @@ -2,3 +2,4 @@ include(RunCMake) run_cmake(ModifiedAccess) run_cmake(NoWatcher) +run_cmake(WatchTwice) diff --git a/Tests/RunCMake/WatchTwice/WatchTwice-stderr.txt b/Tests/RunCMake/variable_watch/WatchTwice-stderr.txt similarity index 100% rename from Tests/RunCMake/WatchTwice/WatchTwice-stderr.txt rename to Tests/RunCMake/variable_watch/WatchTwice-stderr.txt diff --git a/Tests/RunCMake/WatchTwice/WatchTwice.cmake b/Tests/RunCMake/variable_watch/WatchTwice.cmake similarity index 100% rename from Tests/RunCMake/WatchTwice/WatchTwice.cmake rename to Tests/RunCMake/variable_watch/WatchTwice.cmake ----------------------------------------------------------------------- Summary of changes: Source/cmVariableWatchCommand.cxx | 3 ++- Tests/RunCMake/CMakeLists.txt | 1 - Tests/RunCMake/WatchTwice/CMakeLists.txt | 3 --- Tests/RunCMake/WatchTwice/RunCMakeTest.cmake | 3 --- Tests/RunCMake/variable_watch/RunCMakeTest.cmake | 1 + .../WatchTwice-stderr.txt | 0 .../WatchTwice.cmake | 0 7 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 Tests/RunCMake/WatchTwice/CMakeLists.txt delete mode 100644 Tests/RunCMake/WatchTwice/RunCMakeTest.cmake rename Tests/RunCMake/{WatchTwice => variable_watch}/WatchTwice-stderr.txt (100%) rename Tests/RunCMake/{WatchTwice => variable_watch}/WatchTwice.cmake (100%) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits