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 c58a90cde0fb09899c7999cc89ea6145edc2ff15 (commit)
via 92b2c6189ddbe1293989d469c214f6f306b2ed6e (commit)
from 9d10a8223e96a7bc54b56a3f7c2dd8a8169ed297 (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=c58a90cde0fb09899c7999cc89ea6145edc2ff15
commit c58a90cde0fb09899c7999cc89ea6145edc2ff15
Merge: 9d10a82 92b2c61
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Sep 22 09:45:59 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 22 09:45:59 2014 -0400
Merge topic 'fix-LOCATION-slashes' into next
92b2c618 Remove extra slashes from LOCATION target property value
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92b2c6189ddbe1293989d469c214f6f306b2ed6e
commit 92b2c6189ddbe1293989d469c214f6f306b2ed6e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Sep 22 09:30:52 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Sep 22 09:32:21 2014 -0400
Remove extra slashes from LOCATION target property value
In commit v3.0.0-rc1~429^2~2 (Remove the Location member from cmTarget,
2012-10-07) a few extra slashes were added to the path construction
logic, perhaps due to a partially implemented attempt at handling the
case that GetDirectory returns an empty string. This leads to LOCATION
paths with double slashes in some cases. Remove them now.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index acae0b3..f4714a9 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2769,16 +2769,11 @@ const char* cmTarget::GetLocationForBuild() const
// Now handle the deprecated build-time configuration location.
location = this->GetDirectory();
- if(!location.empty())
- {
- location += "/";
- }
const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR");
if(cfgid && strcmp(cfgid, ".") != 0)
{
location += "/";
location += cfgid;
- location += "/";
}
if(this->IsAppBundleOnApple())
-----------------------------------------------------------------------
Summary of changes:
Source/cmTarget.cxx | 5 -----
1 file changed, 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
