[Cmake-commits] CMake branch, next, updated. v3.6.2-1314-g86aeeb1

[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  86aeeb1a3f61a56e9a864ff3be8cba47ca76ef45 (commit)
       via  6dd39afe104b89baf051e803ff22551a74176bda (commit)
      from  e6cd89b6b31760c5aee1aa0ae354014cd4b498e8 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86aeeb1a3f61a56e9a864ff3be8cba47ca76ef45
commit 86aeeb1a3f61a56e9a864ff3be8cba47ca76ef45
Merge: e6cd89b 6dd39af
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 3 13:42:22 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 3 13:42:22 2016 -0400

    Merge topic 'add-BUILD_RPATH' into next
    
    6dd39afe fixup! Add a BUILD_RPATH target property specifying build-tree RPATH entries


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dd39afe104b89baf051e803ff22551a74176bda
commit 6dd39afe104b89baf051e803ff22551a74176bda
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 3 13:41:13 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 3 13:41:13 2016 -0400

    fixup! Add a BUILD_RPATH target property specifying build-tree RPATH entries

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index cb6abb3..13a4744 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -102,7 +102,7 @@ cmTarget::cmTarget(std::string const& name, cmState::TargetType type,
     this->SetPropertyDefault("ANDROID_JAR_DEPENDENCIES", CM_NULLPTR);
     this->SetPropertyDefault("ANDROID_ASSETS_DIRECTORIES", CM_NULLPTR);
     this->SetPropertyDefault("ANDROID_ANT_ADDITIONAL_OPTIONS", CM_NULLPTR);
-    this->SetPropertyDefault("BUILD_RPATH", "");
+    this->SetPropertyDefault("BUILD_RPATH", CM_NULLPTR);
     this->SetPropertyDefault("INSTALL_NAME_DIR", CM_NULLPTR);
     this->SetPropertyDefault("INSTALL_RPATH", "");
     this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF");

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

Summary of changes:
 Source/cmTarget.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake