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 2d35d005e98784eafb2e530e528e08da3733ec46 (commit)
via 31ca983c5b518efe0aeef79c1890f4faaadc3855 (commit)
from aa8e2a9bd9cd4f227602798f77a8452252f47b7b (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=2d35d005e98784eafb2e530e528e08da3733ec46
commit 2d35d005e98784eafb2e530e528e08da3733ec46
Merge: aa8e2a9 31ca983
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Dec 9 13:33:02 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Dec 9 13:33:02 2013 -0500
Merge topic 'fix-INTERFACE-mapped-config' into next
31ca983 Don't search for IMPORTED_LOCATION of INTERFACE_LIBRARY (14636)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31ca983c5b518efe0aeef79c1890f4faaadc3855
commit 31ca983c5b518efe0aeef79c1890f4faaadc3855
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Dec 9 19:12:57 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Mon Dec 9 19:30:49 2013 +0100
Don't search for IMPORTED_LOCATION of INTERFACE_LIBRARY (14636)
The INTERFACE_LIBRARY type does not have any LOCATION at all, so
return early from GetMappedConfig. GetMappedConfig is called from
two locations, one of which already pre-checks the INTERFACE_LIBRARY
case. Remove that pre-check and handle that case inside the method
instead.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 38fe945..51ee31a 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4860,6 +4860,15 @@ bool cmTarget::GetMappedConfig(std::string const&
desired_config,
const char** imp,
std::string& suffix) const
{
+ if (this->GetType() == INTERFACE_LIBRARY)
+ {
+ // This method attempts to find a config-specific LOCATION for the
+ // IMPORTED library. In the case of INTERFACE_LIBRARY, there is no
+ // LOCATION at all, so leaving *loc and *imp unchanged is the appropriate
+ // and valid response.
+ return true;
+ }
+
// Track the configuration-specific property suffix.
suffix = "_";
suffix += desired_config;
@@ -4992,8 +5001,7 @@ void cmTarget::ComputeImportInfo(std::string const&
desired_config,
const char* loc = 0;
const char* imp = 0;
std::string suffix;
- if (this->GetType() != INTERFACE_LIBRARY &&
- !this->GetMappedConfig(desired_config, &loc, &imp, suffix))
+ if (!this->GetMappedConfig(desired_config, &loc, &imp, suffix))
{
return;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmTarget.cxx | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
