[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3294-g3d87c93

[Ben Boeckel]

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  3d87c935cda0b90bf3017dad3795ed428fa75fcb (commit)
       via  360eb206ee44558ef672be384997fe9a0b0d2041 (commit)
       via  b565e42a9831fd3958b6a14191d94e2010d10127 (commit)
       via  54e48730fb9f3b2c5bf56eb3f96e5cae690934c4 (commit)
      from  14d87c255ff602bc4597aa687be09fb160f29b89 (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=3d87c935cda0b90bf3017dad3795ed428fa75fcb
commit 3d87c935cda0b90bf3017dad3795ed428fa75fcb
Merge: 14d87c2 360eb20
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jul 22 17:28:03 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 22 17:28:03 2013 -0400

    Merge topic 'dev/property-append-with-empty-string' into next
    
    360eb20 When appending, always pass non-NULL values
    b565e42 When appending, we cannot remove properties
    54e4873 Add a test which appends nothing to a property


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=360eb206ee44558ef672be384997fe9a0b0d2041
commit 360eb206ee44558ef672be384997fe9a0b0d2041
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jul 22 17:23:26 2013 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Jul 22 17:24:18 2013 -0400

    When appending, always pass non-NULL values

diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index 578a59c..b5e5225 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -162,7 +162,7 @@ bool cmSetPropertyCommand::HandleGlobalMode()
     }
   if(this->AppendMode)
     {
-    cm->AppendProperty(name, value, this->AppendAsString);
+    cm->AppendProperty(name, value ? value : "", this->AppendAsString);
     }
   else
     {
@@ -228,7 +228,7 @@ bool cmSetPropertyCommand::HandleDirectoryMode()
     }
   if(this->AppendMode)
     {
-    mf->AppendProperty(name, value, this->AppendAsString);
+    mf->AppendProperty(name, value ? value : "", this->AppendAsString);
     }
   else
     {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b565e42a9831fd3958b6a14191d94e2010d10127
commit b565e42a9831fd3958b6a14191d94e2010d10127
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jul 22 17:22:37 2013 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Jul 22 17:22:37 2013 -0400

    When appending, we cannot remove properties

diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index cc10840..578a59c 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -84,12 +84,14 @@ bool cmSetPropertyCommand
       {
       doing = DoingNone;
       this->AppendMode = true;
+      this->Remove = false;
       this->AppendAsString = false;
       }
     else if(*arg == "APPEND_STRING")
       {
       doing = DoingNone;
       this->AppendMode = true;
+      this->Remove = false;
       this->AppendAsString = true;
       }
     else if(doing == DoingNames)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54e48730fb9f3b2c5bf56eb3f96e5cae690934c4
commit 54e48730fb9f3b2c5bf56eb3f96e5cae690934c4
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jul 22 17:19:55 2013 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Jul 22 17:19:55 2013 -0400

    Add a test which appends nothing to a property

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index fcefaf9..2f105fb 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -225,6 +225,7 @@ if(BUILD_TESTING)
   ADD_TEST_MACRO(ObjectLibrary UseCshared)
   ADD_TEST_MACRO(NewlineArgs NewlineArgs)
   ADD_TEST_MACRO(SetLang SetLang)
+  ADD_TEST_MACRO(EmptyTargetProperty EmptyTargetProperty)
   ADD_TEST_MACRO(ExternalOBJ ExternalOBJ)
   ADD_TEST_MACRO(LoadCommand LoadedCommand)
   ADD_TEST_MACRO(LinkDirectory bin/LinkDirectory)
diff --git a/Tests/EmptyProperty/CMakeLists.txt b/Tests/EmptyProperty/CMakeLists.txt
new file mode 100644
index 0000000..39e75f3
--- /dev/null
+++ b/Tests/EmptyProperty/CMakeLists.txt
@@ -0,0 +1,9 @@
+project (EmptyProperty)
+
+set_property(DIRECTORY APPEND
+    PROPERTY
+        COMPILE_DEFINITIONS)
+
+include(CTest)
+
+add_executable(EmptyProperty EmptyProperty.cxx)
diff --git a/Tests/EmptyProperty/EmptyProperty.cxx b/Tests/EmptyProperty/EmptyProperty.cxx
new file mode 100644
index 0000000..78f2de1
--- /dev/null
+++ b/Tests/EmptyProperty/EmptyProperty.cxx
@@ -0,0 +1 @@
+int main(void) { return 0; }

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

Summary of changes:
 Source/cmSetPropertyCommand.cxx                    |    6 ++++--
 Tests/CMakeLists.txt                               |    1 +
 Tests/EmptyProperty/CMakeLists.txt                 |    9 +++++++++
 .../main.c => EmptyProperty/EmptyProperty.cxx}     |    0
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 Tests/EmptyProperty/CMakeLists.txt
 copy Tests/{CMakeOnly/LinkInterfaceLoop/main.c => EmptyProperty/EmptyProperty.cxx} (100%)


hooks/post-receive
-- 
CMake