[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2746-g98f389e

[Stephen Kelly]

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  98f389eb19d3f56de0c8d68d50be7a3be6a3577a (commit)
       via  5a5e0fa9d35ea49ef9d31993ab415fc0e390e8b0 (commit)
       via  a5b39fd3c68b61a33957b03807db14b02cdea4c4 (commit)
       via  a96452ec066933974518acf015e9494f3b0834c5 (commit)
       via  4336fadff05b4e490ff48282e1b9e30c89de5d39 (commit)
       via  88073c8e08302c9cea309d9753c11dc01a7d5f1c (commit)
      from  f3b4525969f174fe00d5f6ed4168e51e644e5922 (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=98f389eb19d3f56de0c8d68d50be7a3be6a3577a
commit 98f389eb19d3f56de0c8d68d50be7a3be6a3577a
Merge: f3b4525 5a5e0fa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 10 12:15:14 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 10 12:15:14 2013 -0400

    Merge topic 'fix-clear-INCLUDE_DIRECTORIES-prop' into next
    
    5a5e0fa Fix clearing of the INCLUDE_DIRECTORIES DIRECTORY property.
    a5b39fd CMake Nightly Date Stamp
    a96452e CMake Nightly Date Stamp
    4336fad CMake Nightly Date Stamp
    88073c8 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a5e0fa9d35ea49ef9d31993ab415fc0e390e8b0
commit 5a5e0fa9d35ea49ef9d31993ab415fc0e390e8b0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 10 18:12:56 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 10 18:12:56 2013 +0200

    Fix clearing of the INCLUDE_DIRECTORIES DIRECTORY property.
    
    This was broken by commit 18a3195a (Keep track of INCLUDE_DIRECTORIES
    as a vector of structs., 2012-11-19).

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 25ccbc7..47a6d2e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3458,6 +3458,10 @@ void cmMakefile::SetProperty(const char* prop, const char* value)
   if (propname == "INCLUDE_DIRECTORIES")
     {
     this->IncludeDirectoriesEntries.clear();
+      if (!value)
+        {
+        return;
+        }
     cmListFileBacktrace lfbt;
     this->GetBacktrace(lfbt);
     this->IncludeDirectoriesEntries.push_back(
diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
index 60f5e5e..8a60f17 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -47,3 +47,14 @@ else()
 endif()
 
 add_subdirectory(TargetIncludeDirectories)
+
+set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}")
+get_property(propContent DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
+if (NOT propContent STREQUAL "${CMAKE_BINARY_DIR}")
+  message(SEND_ERROR "Setting DIRECTORY property failed.")
+endif()
+set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
+get_property(propContentAfter DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
+if (NOT propContentAfter STREQUAL "")
+  message(SEND_ERROR "Clearing DIRECTORY property failed.")
+endif()

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

Summary of changes:
 Source/CMakeVersion.cmake               |    2 +-
 Source/cmMakefile.cxx                   |    4 ++++
 Tests/IncludeDirectories/CMakeLists.txt |   11 +++++++++++
 3 files changed, 16 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake