[Cmake-commits] CMake branch, next, updated. v2.8.11-2437-g46c1e65

[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  46c1e65f85509be189e945db11557829c966a962 (commit)
       via  c63d30048bcf5bd6efa1e038b36c5efd29e34749 (commit)
       via  3d5bb381be16f67e4781c395bda2be12a5d00168 (commit)
      from  f0d8665567f98192fd88fb4cb9bdb6e9d04e6cb2 (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=46c1e65f85509be189e945db11557829c966a962
commit 46c1e65f85509be189e945db11557829c966a962
Merge: f0d8665 c63d300
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 3 10:23:47 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 3 10:23:47 2013 -0400

    Merge topic 'fix-variable_watch-cases' into next
    
    c63d300 variable_watch: Add test for MODIFIED_ACCESS report
    3d5bb38 variable_watch: Add missing string enumeration entry (#14188)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c63d30048bcf5bd6efa1e038b36c5efd29e34749
commit c63d30048bcf5bd6efa1e038b36c5efd29e34749
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 3 09:23:25 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 3 10:20:31 2013 -0400

    variable_watch: Add test for MODIFIED_ACCESS report
    
    Add a RunCMake.variable_watch watch test to cover the basic use case.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index f1e01b1..86c9725 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -77,6 +77,7 @@ add_RunCMake_test(include)
 add_RunCMake_test(include_directories)
 add_RunCMake_test(list)
 add_RunCMake_test(try_compile)
+add_RunCMake_test(variable_watch)
 add_RunCMake_test(CMP0004)
 
 find_package(Qt4 QUIET)
diff --git a/Tests/RunCMake/variable_watch/CMakeLists.txt b/Tests/RunCMake/variable_watch/CMakeLists.txt
new file mode 100644
index 0000000..e8db6b0
--- /dev/null
+++ b/Tests/RunCMake/variable_watch/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/variable_watch/ModifiedAccess-stderr.txt b/Tests/RunCMake/variable_watch/ModifiedAccess-stderr.txt
new file mode 100644
index 0000000..3287626
--- /dev/null
+++ b/Tests/RunCMake/variable_watch/ModifiedAccess-stderr.txt
@@ -0,0 +1,3 @@
+\* Variable "b" was accessed using MODIFIED_ACCESS in: .*/Tests/RunCMake/variable_watch/ModifiedAccess.cmake
+  The value of the variable: "b"
+  The list file stack: .*/Tests/RunCMake/variable_watch/CMakeLists.txt;.*/Tests/RunCMake/variable_watch/ModifiedAccess.cmake
diff --git a/Tests/RunCMake/variable_watch/ModifiedAccess.cmake b/Tests/RunCMake/variable_watch/ModifiedAccess.cmake
new file mode 100644
index 0000000..87943b3
--- /dev/null
+++ b/Tests/RunCMake/variable_watch/ModifiedAccess.cmake
@@ -0,0 +1,3 @@
+set(b "a")
+variable_watch(b)
+set(b "b")
diff --git a/Tests/RunCMake/variable_watch/RunCMakeTest.cmake b/Tests/RunCMake/variable_watch/RunCMakeTest.cmake
new file mode 100644
index 0000000..1dd7688
--- /dev/null
+++ b/Tests/RunCMake/variable_watch/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(ModifiedAccess)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d5bb381be16f67e4781c395bda2be12a5d00168
commit 3d5bb381be16f67e4781c395bda2be12a5d00168
Author:     Yichao Yu <yyc1992 at gmail.com>
AuthorDate: Mon Jun 3 10:14:52 2013 +0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 3 10:20:08 2013 -0400

    variable_watch: Add missing string enumeration entry (#14188)
    
    In commit 9a5b4eba (All variable accesses should produce watch
    callbacks, 2007-05-17) we added a new enumeration value but did not
    update the list of strings matching them.  Add the missing entry.
    Without this, variable_watch prints REMOVED_ACCESS instead of
    MODIFIED_ACCESS when set the value of the variable.

diff --git a/Source/cmVariableWatch.cxx b/Source/cmVariableWatch.cxx
index f5fdca4..3905e9b 100644
--- a/Source/cmVariableWatch.cxx
+++ b/Source/cmVariableWatch.cxx
@@ -15,6 +15,7 @@ static const char* const cmVariableWatchAccessStrings[] =
 {
     "READ_ACCESS",
     "UNKNOWN_READ_ACCESS",
+    "UNKNOWN_DEFINED_ACCESS",
     "ALLOWED_UNKNOWN_READ_ACCESS",
     "MODIFIED_ACCESS",
     "REMOVED_ACCESS",

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

Summary of changes:
 Source/cmVariableWatch.cxx                         |    1 +
 Tests/RunCMake/CMakeLists.txt                      |    1 +
 .../{CMP0004 => variable_watch}/CMakeLists.txt     |    0
 .../variable_watch/ModifiedAccess-stderr.txt       |    3 +++
 Tests/RunCMake/variable_watch/ModifiedAccess.cmake |    3 +++
 Tests/RunCMake/variable_watch/RunCMakeTest.cmake   |    3 +++
 6 files changed, 11 insertions(+), 0 deletions(-)
 copy Tests/RunCMake/{CMP0004 => variable_watch}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/variable_watch/ModifiedAccess-stderr.txt
 create mode 100644 Tests/RunCMake/variable_watch/ModifiedAccess.cmake
 create mode 100644 Tests/RunCMake/variable_watch/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake