[Cmake-commits] CMake branch, next, updated. v3.2.2-3187-gafff202
Brad King
brad.king at kitware.com
Tue May 26 14:30:56 EDT 2015
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 afff20266e5ceeb609a0ed73615e9cb8d0d3dd15 (commit)
via d55f4683b3267f9ab5a3dead5a663188d8e543bf (commit)
via f6142936aefd2952cb3958951d53d0e512acaf7f (commit)
via 2a56aad9e9d84f5b6e64bfa0a2d422866a121cef (commit)
from 3e0ebd632ba8636b5a7f4c38d07c9e1839e521c1 (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=afff20266e5ceeb609a0ed73615e9cb8d0d3dd15
commit afff20266e5ceeb609a0ed73615e9cb8d0d3dd15
Merge: 3e0ebd6 d55f468
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 14:30:54 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 26 14:30:54 2015 -0400
Merge topic 'imported-interface-libname' into next
d55f4683 Allow imported INTERFACE libraries to specify a link library name
f6142936 cmTarget: Refactor GetMappedConfig to choose location property up front
2a56aad9 cmTarget: Clarify comments in GetMappedConfig
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d55f4683b3267f9ab5a3dead5a663188d8e543bf
commit d55f4683b3267f9ab5a3dead5a663188d8e543bf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 19 15:36:28 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 26 14:23:26 2015 -0400
Allow imported INTERFACE libraries to specify a link library name
Add an IMPORTED_LIBNAME[_<CONFIG>] target property to specify a library
name to be placed on the link line in place of an interface library
since it has no library file of its own. Restrict use of the property
to imported INTERFACE libraries.
This will be particularly useful for find modules that need to provide
imported libraries from system SDKs where the full path to the library
file is not known. Now such find modules will be able to provide an
imported interface library and set IMPORTED_LIBNAME to refer to the
SDK library by name. See issue 15267.
The IMPORTED_LIBNAME[_<CONFIG>] property also allows us to implement
MAP_IMPORTED_CONFIG_<CONFIG> for interface libraries. Drop some of the
special cases added by commit v3.0.0-rc1~301^2~1 (INTERFACE_LIBRARY:
Avoid codepaths which set unneeded properties, 2013-11-20) and commit
v3.0.0-rc1~237^2 (Don't search for IMPORTED_LOCATION of
INTERFACE_LIBRARY, 2013-12-09). Ensure the test added by commit
v3.0.0-rc1~150^2 (InterfaceLibrary: Add test requiring
MAP_IMPORTED_CONFIG whitelisting, 2014-01-09) still passes.
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 615254e..9bbecec 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -142,6 +142,8 @@ Properties on Targets
/prop_tgt/IMPORTED_CONFIGURATIONS
/prop_tgt/IMPORTED_IMPLIB_CONFIG
/prop_tgt/IMPORTED_IMPLIB
+ /prop_tgt/IMPORTED_LIBNAME_CONFIG
+ /prop_tgt/IMPORTED_LIBNAME
/prop_tgt/IMPORTED_LINK_DEPENDENT_LIBRARIES_CONFIG
/prop_tgt/IMPORTED_LINK_DEPENDENT_LIBRARIES
/prop_tgt/IMPORTED_LINK_INTERFACE_LANGUAGES_CONFIG
diff --git a/Help/prop_tgt/IMPORTED_LIBNAME.rst b/Help/prop_tgt/IMPORTED_LIBNAME.rst
new file mode 100644
index 0000000..6b35ca7
--- /dev/null
+++ b/Help/prop_tgt/IMPORTED_LIBNAME.rst
@@ -0,0 +1,22 @@
+IMPORTED_LIBNAME
+----------------
+
+Specify the link library name for an :ref:`imported <Imported Targets>`
+:ref:`Interface Library <Interface Libraries>`.
+
+An interface library has no library file so linking to it normally
+adds its usage requirements but does not link to an actual library.
+The ``IMPORTED_LIBNAME`` property specifies a single library name
+to be placed on the link line in place of the interface library.
+
+This property is intended for use in naming libraries provided by
+a platform SDK for which the full path to a library file may not
+be known. The value may be a plain library name such as ``foo``
+but may *not* be a path (e.g. ``/usr/lib/libfoo.so``) or a flag
+(e.g. ``-Wl,...``). The name is never treated as a library target
+name even if it happens to name one.
+
+The ``IMPORTED_LIBNAME`` property is allowed only on
+:ref:`imported <Imported Targets>` :ref:`Interface Libraries`
+and is rejected on targets of other types (for which
+the :prop_tgt:`IMPORTED_LOCATION` target property may be used).
diff --git a/Help/prop_tgt/IMPORTED_LIBNAME_CONFIG.rst b/Help/prop_tgt/IMPORTED_LIBNAME_CONFIG.rst
new file mode 100644
index 0000000..a28b838
--- /dev/null
+++ b/Help/prop_tgt/IMPORTED_LIBNAME_CONFIG.rst
@@ -0,0 +1,7 @@
+IMPORTED_LIBNAME_<CONFIG>
+-------------------------
+
+<CONFIG>-specific version of :prop_tgt:`IMPORTED_LIBNAME` property.
+
+Configuration names correspond to those provided by the project from
+which the target is imported.
diff --git a/Help/release/dev/imported-interface-libname.rst b/Help/release/dev/imported-interface-libname.rst
new file mode 100644
index 0000000..bde0eab
--- /dev/null
+++ b/Help/release/dev/imported-interface-libname.rst
@@ -0,0 +1,7 @@
+imported-interface-libname
+--------------------------
+
+* :ref:`Imported <Imported Targets>` :ref:`Interface Libraries` learned new
+ :prop_tgt:`IMPORTED_LIBNAME` and :prop_tgt:`IMPORTED_LIBNAME_<CONFIG>`
+ target properties to specify a link library name since interface libraries
+ do not have their own library files.
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index e6cbe60..53abb10 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -658,6 +658,13 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
// of COMPATIBLE_INTERFACE_ enforcement. The generators will ignore
// this for the actual link line.
this->Items.push_back(Item(std::string(), true, tgt));
+
+ // Also add the item the interface specifies to be used in its place.
+ std::string const& libName = tgt->GetImportedLibName(config);
+ if (!libName.empty())
+ {
+ this->AddItem(libName, 0);
+ }
}
else
{
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 88ec61b..3fc90c5 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -77,6 +77,7 @@ struct cmTarget::ImportInfo
std::string Location;
std::string SOName;
std::string ImportLibrary;
+ std::string LibName;
std::string Languages;
std::string Libraries;
std::string LibrariesProp;
@@ -364,11 +365,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
std::string configUpper = cmSystemTools::UpperCase(*ci);
for(const char** p = configProps; *p; ++p)
{
- if (this->TargetTypeValue == INTERFACE_LIBRARY
- && strcmp(*p, "MAP_IMPORTED_CONFIG_") != 0)
- {
- continue;
- }
std::string property = *p;
property += configUpper;
this->SetPropertyDefault(property, 0);
@@ -1675,7 +1671,10 @@ static bool whiteListedInterfaceProperty(const std::string& prop)
return true;
}
- if (cmHasLiteralPrefix(prop, "MAP_IMPORTED_CONFIG_"))
+ if (prop == "IMPORTED_CONFIGURATIONS" ||
+ prop == "IMPORTED_LIBNAME" ||
+ cmHasLiteralPrefix(prop, "IMPORTED_LIBNAME_") ||
+ cmHasLiteralPrefix(prop, "MAP_IMPORTED_CONFIG_"))
{
return true;
}
@@ -1745,6 +1744,11 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
<< this->Name << "\")\n";
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
}
+ else if(cmHasLiteralPrefix(prop, "IMPORTED_LIBNAME") &&
+ !this->CheckImportedLibName(prop, value? value:""))
+ {
+ /* error was reported by check method */
+ }
else if (prop == "LINK_LIBRARIES")
{
this->Internal->LinkImplementationPropertyEntries.clear();
@@ -1832,6 +1836,11 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
<< this->Name << "\")\n";
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
}
+ else if(cmHasLiteralPrefix(prop, "IMPORTED_LIBNAME"))
+ {
+ this->Makefile->IssueMessage(cmake::FATAL_ERROR,
+ prop + " property may not be APPENDed.");
+ }
else if (prop == "LINK_LIBRARIES")
{
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
@@ -3837,6 +3846,16 @@ void cmTarget::GetFullNameComponents(std::string& prefix, std::string& base,
}
//----------------------------------------------------------------------------
+std::string cmTarget::GetImportedLibName(std::string const& config) const
+{
+ if (cmTarget::ImportInfo const* info = this->GetImportInfo(config))
+ {
+ return info->LibName;
+ }
+ return std::string();
+}
+
+//----------------------------------------------------------------------------
std::string cmTarget::GetFullPath(const std::string& config, bool implib,
bool realname) const
{
@@ -5393,15 +5412,9 @@ 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;
- }
- std::string const locPropBase = "IMPORTED_LOCATION";
+ std::string const locPropBase =
+ this->GetType() == INTERFACE_LIBRARY?
+ "IMPORTED_LIBNAME" : "IMPORTED_LOCATION";
// Track the configuration-specific property suffix.
suffix = "_";
@@ -5451,7 +5464,9 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
// any other configuration.
if(!mappedConfigs.empty() && !*loc && !*imp)
{
- return false;
+ // Interface libraries are always available because their
+ // library name is optional so it is okay to leave *loc empty.
+ return this->GetType() == cmTarget::INTERFACE_LIBRARY;
}
// If we have not yet found it then there are no mapped
@@ -5515,7 +5530,9 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
// If we have not yet found it then the target location is not available.
if(!*loc && !*imp)
{
- return false;
+ // Interface libraries are always available because their
+ // library name is optional so it is okay to leave *loc empty.
+ return this->GetType() == cmTarget::INTERFACE_LIBRARY;
}
return true;
@@ -5568,6 +5585,10 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
}
if(this->GetType() == INTERFACE_LIBRARY)
{
+ if (loc)
+ {
+ info.LibName = loc;
+ }
return;
}
@@ -5692,6 +5713,37 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
}
//----------------------------------------------------------------------------
+bool cmTarget::CheckImportedLibName(std::string const& prop,
+ std::string const& value) const
+{
+ if (this->GetType() != cmTarget::INTERFACE_LIBRARY ||
+ !this->IsImported())
+ {
+ this->Makefile->IssueMessage(cmake::FATAL_ERROR, prop +
+ " property may be set only on imported INTERFACE library targets.");
+ return false;
+ }
+ if (!value.empty())
+ {
+ if (value[0] == '-')
+ {
+ this->Makefile->IssueMessage(cmake::FATAL_ERROR, prop +
+ " property value\n " + value + "\nmay not start in '-'.");
+ return false;
+ }
+ std::string::size_type bad = value.find_first_of(":/\\;");
+ if (bad != value.npos)
+ {
+ this->Makefile->IssueMessage(cmake::FATAL_ERROR, prop +
+ " property value\n " + value + "\nmay not contain '" +
+ value.substr(bad,1) + "'.");
+ return false;
+ }
+ }
+ return true;
+}
+
+//----------------------------------------------------------------------------
cmTarget::LinkInterface const* cmTarget::GetLinkInterface(
const std::string& config,
cmTarget const* head) const
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 2150b83..f5700dc 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -435,6 +435,9 @@ public:
no soname at all. */
bool IsImportedSharedLibWithoutSOName(const std::string& config) const;
+ /** Get the library name for an imported interface library. */
+ std::string GetImportedLibName(std::string const& config) const;
+
/** Get the full path to the target according to the settings in its
makefile and the configuration type. */
std::string GetFullPath(const std::string& config="", bool implib = false,
@@ -792,6 +795,9 @@ private:
void ComputeImportInfo(std::string const& desired_config,
ImportInfo& info) const;
+ bool CheckImportedLibName(std::string const& prop,
+ std::string const& value) const;
+
// Cache target compile paths for each configuration.
struct CompileInfo;
CompileInfo const* GetCompileInfo(const std::string& config) const;
diff --git a/Tests/InterfaceLibrary/CMakeLists.txt b/Tests/InterfaceLibrary/CMakeLists.txt
index ee81419..d3f2e49 100644
--- a/Tests/InterfaceLibrary/CMakeLists.txt
+++ b/Tests/InterfaceLibrary/CMakeLists.txt
@@ -25,8 +25,23 @@ target_sources(iface_objlib INTERFACE $<TARGET_OBJECTS:objlib>)
add_library(intermediate INTERFACE)
target_link_libraries(intermediate INTERFACE iface_objlib)
+add_library(item_fake STATIC item_fake.cpp)
+add_library(item_real STATIC item.cpp)
+add_library(item_iface INTERFACE IMPORTED)
+set_property(TARGET item_iface PROPERTY IMPORTED_LIBNAME item_real)
+add_dependencies(item_iface item_real)
+link_directories(${CMAKE_CURRENT_BINARY_DIR})
+
add_executable(InterfaceLibrary definetestexe.cpp)
-target_link_libraries(InterfaceLibrary iface_nodepends headeriface subiface intermediate)
+target_link_libraries(InterfaceLibrary
+ iface_nodepends
+ headeriface
+ subiface
+ intermediate
+
+ item_iface
+ item_fake # ensure that 'item_real' is ordered in place of item_iface
+ )
add_subdirectory(libsdir)
diff --git a/Tests/InterfaceLibrary/definetestexe.cpp b/Tests/InterfaceLibrary/definetestexe.cpp
index 9044076..e6b7f58 100644
--- a/Tests/InterfaceLibrary/definetestexe.cpp
+++ b/Tests/InterfaceLibrary/definetestexe.cpp
@@ -17,8 +17,9 @@
extern int obj();
extern int sub();
+extern int item();
int main(int,char**)
{
- return obj() + sub();
+ return obj() + sub() + item();
}
diff --git a/Tests/InterfaceLibrary/item.cpp b/Tests/InterfaceLibrary/item.cpp
new file mode 100644
index 0000000..be612c9
--- /dev/null
+++ b/Tests/InterfaceLibrary/item.cpp
@@ -0,0 +1 @@
+int item() { return 0; }
diff --git a/Tests/InterfaceLibrary/item_fake.cpp b/Tests/InterfaceLibrary/item_fake.cpp
new file mode 100644
index 0000000..3944710
--- /dev/null
+++ b/Tests/InterfaceLibrary/item_fake.cpp
@@ -0,0 +1,2 @@
+extern int item_undefined();
+int item() { return item_undefined(); }
diff --git a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-result.txt b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-stderr.txt b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-stderr.txt
new file mode 100644
index 0000000..24f8ea9
--- /dev/null
+++ b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-stderr.txt
@@ -0,0 +1,44 @@
+^CMake Error at IMPORTED_LIBNAME-bad-value.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property value
+
+ -flag
+
+ may not start in '-'.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-bad-value.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property value
+
+ item1;item2
+
+ may not contain ';'.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-bad-value.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property value
+
+ /path/to/item1
+
+ may not contain '/'.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-bad-value.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property value
+
+ \\path\\to\\item1
+
+ may not contain '\\'.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-bad-value.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property value
+
+ c:\\path\\to\\item1
+
+ may not contain ':'.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value.cmake b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value.cmake
new file mode 100644
index 0000000..1af65b4
--- /dev/null
+++ b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value.cmake
@@ -0,0 +1,6 @@
+add_library(MyTarget INTERFACE IMPORTED)
+set_property(TARGET MyTarget PROPERTY IMPORTED_LIBNAME -flag)
+set_property(TARGET MyTarget PROPERTY IMPORTED_LIBNAME item1 item2)
+set_property(TARGET MyTarget PROPERTY IMPORTED_LIBNAME /path/to/item1)
+set_property(TARGET MyTarget PROPERTY IMPORTED_LIBNAME \\path\\to\\item1)
+set_property(TARGET MyTarget PROPERTY IMPORTED_LIBNAME c:\\path\\to\\item1)
diff --git a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface-result.txt b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface-stderr.txt b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface-stderr.txt
new file mode 100644
index 0000000..3a329d2
--- /dev/null
+++ b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface-stderr.txt
@@ -0,0 +1,45 @@
+^CMake Error at IMPORTED_LIBNAME-non-iface.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property may be set only on imported INTERFACE library
+ targets.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-non-iface.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property may not be APPENDed.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-non-iface.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME_DEBUG property may be set only on imported INTERFACE
+ library targets.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-non-iface.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME_DEBUG property may not be APPENDed.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-non-iface.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property may be set only on imported INTERFACE library
+ targets.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-non-iface.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property may be set only on imported INTERFACE library
+ targets.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-non-iface.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property may be set only on imported INTERFACE library
+ targets.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-non-iface.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property may be set only on imported INTERFACE library
+ targets.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface.cmake b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface.cmake
new file mode 100644
index 0000000..fe6841a
--- /dev/null
+++ b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface.cmake
@@ -0,0 +1,17 @@
+add_custom_target(MyCustom)
+set_property(TARGET MyCustom PROPERTY IMPORTED_LIBNAME item1)
+set_property(TARGET MyCustom APPEND PROPERTY IMPORTED_LIBNAME item2)
+set_property(TARGET MyCustom PROPERTY IMPORTED_LIBNAME_DEBUG item1)
+set_property(TARGET MyCustom APPEND PROPERTY IMPORTED_LIBNAME_DEBUG item2)
+
+add_library(MyStatic STATIC IMPORTED)
+set_property(TARGET MyStatic PROPERTY IMPORTED_LIBNAME item1)
+
+add_library(MyShared SHARED IMPORTED)
+set_property(TARGET MyShared PROPERTY IMPORTED_LIBNAME item1)
+
+add_library(MyModule MODULE IMPORTED)
+set_property(TARGET MyModule PROPERTY IMPORTED_LIBNAME item1)
+
+add_executable(MyExe IMPORTED)
+set_property(TARGET MyExe PROPERTY IMPORTED_LIBNAME item1)
diff --git a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported-result.txt b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported-stderr.txt b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported-stderr.txt
new file mode 100644
index 0000000..e9d94cf
--- /dev/null
+++ b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported-stderr.txt
@@ -0,0 +1,21 @@
+^CMake Error at IMPORTED_LIBNAME-non-imported.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property may be set only on imported INTERFACE library
+ targets.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-non-imported.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME property may not be APPENDed.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-non-imported.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME_DEBUG property may be set only on imported INTERFACE
+ library targets.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at IMPORTED_LIBNAME-non-imported.cmake:[0-9]+ \(set_property\):
+ IMPORTED_LIBNAME_DEBUG property may not be APPENDed.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported.cmake b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported.cmake
new file mode 100644
index 0000000..07a67d7
--- /dev/null
+++ b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported.cmake
@@ -0,0 +1,5 @@
+add_library(MyTarget INTERFACE)
+set_property(TARGET MyTarget PROPERTY IMPORTED_LIBNAME item1)
+set_property(TARGET MyTarget APPEND PROPERTY IMPORTED_LIBNAME item2)
+set_property(TARGET MyTarget PROPERTY IMPORTED_LIBNAME_DEBUG item1)
+set_property(TARGET MyTarget APPEND PROPERTY IMPORTED_LIBNAME_DEBUG item2)
diff --git a/Tests/RunCMake/interface_library/RunCMakeTest.cmake b/Tests/RunCMake/interface_library/RunCMakeTest.cmake
index 201daa7..5a6af1d 100644
--- a/Tests/RunCMake/interface_library/RunCMakeTest.cmake
+++ b/Tests/RunCMake/interface_library/RunCMakeTest.cmake
@@ -8,3 +8,6 @@ run_cmake(invalid_signature)
run_cmake(global-interface)
run_cmake(genex_link)
run_cmake(add_custom_command-TARGET)
+run_cmake(IMPORTED_LIBNAME-bad-value)
+run_cmake(IMPORTED_LIBNAME-non-iface)
+run_cmake(IMPORTED_LIBNAME-non-imported)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6142936aefd2952cb3958951d53d0e512acaf7f
commit f6142936aefd2952cb3958951d53d0e512acaf7f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 19 15:34:59 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 26 14:21:02 2015 -0400
cmTarget: Refactor GetMappedConfig to choose location property up front
Store the IMPORTED_LOCATION property name in a variable up front
to avoid duplicating the string literal.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 8a3716c..88ec61b 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5401,6 +5401,7 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
// and valid response.
return true;
}
+ std::string const locPropBase = "IMPORTED_LOCATION";
// Track the configuration-specific property suffix.
suffix = "_";
@@ -5427,7 +5428,7 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
{
// Look for this configuration.
std::string mcUpper = cmSystemTools::UpperCase(*mci);
- std::string locProp = "IMPORTED_LOCATION_";
+ std::string locProp = locPropBase + "_";
locProp += mcUpper;
*loc = this->GetProperty(locProp);
if(allowImp)
@@ -5457,7 +5458,7 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
// configurations. Look for an exact-match.
if(!*loc && !*imp)
{
- std::string locProp = "IMPORTED_LOCATION";
+ std::string locProp = locPropBase;
locProp += suffix;
*loc = this->GetProperty(locProp);
if(allowImp)
@@ -5477,7 +5478,7 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
// Look for a configuration-less location. This may be set by
// manually-written code.
- *loc = this->GetProperty("IMPORTED_LOCATION");
+ *loc = this->GetProperty(locPropBase);
if(allowImp)
{
*imp = this->GetProperty("IMPORTED_IMPLIB");
@@ -5499,7 +5500,7 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
{
suffix = "_";
suffix += cmSystemTools::UpperCase(*aci);
- std::string locProp = "IMPORTED_LOCATION";
+ std::string locProp = locPropBase;
locProp += suffix;
*loc = this->GetProperty(locProp);
if(allowImp)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a56aad9e9d84f5b6e64bfa0a2d422866a121cef
commit 2a56aad9e9d84f5b6e64bfa0a2d422866a121cef
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 19 15:33:10 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 26 14:21:02 2015 -0400
cmTarget: Clarify comments in GetMappedConfig
Clarify comments explaining the availability of a target location
(file on disk) to distinguish this from the existence of the target.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 70005b4..8a3716c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5446,8 +5446,8 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
}
// If we needed to find one of the mapped configurations but did not
- // then the target is not found. The project does not want any
- // other configuration.
+ // then the target location is not found. The project does not want
+ // any other configuration.
if(!mappedConfigs.empty() && !*loc && !*imp)
{
return false;
@@ -5510,7 +5510,8 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
}
}
}
- // If we have not yet found it then the target is not available.
+
+ // If we have not yet found it then the target location is not available.
if(!*loc && !*imp)
{
return false;
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 2 +
Help/prop_tgt/IMPORTED_LIBNAME.rst | 22 +++++
Help/prop_tgt/IMPORTED_LIBNAME_CONFIG.rst | 7 ++
Help/release/dev/imported-interface-libname.rst | 7 ++
Source/cmComputeLinkInformation.cxx | 7 ++
Source/cmTarget.cxx | 100 +++++++++++++++-----
Source/cmTarget.h | 6 ++
Tests/InterfaceLibrary/CMakeLists.txt | 17 +++-
Tests/InterfaceLibrary/definetestexe.cpp | 3 +-
Tests/InterfaceLibrary/item.cpp | 1 +
Tests/InterfaceLibrary/item_fake.cpp | 2 +
.../IMPORTED_LIBNAME-bad-value-result.txt} | 0
.../IMPORTED_LIBNAME-bad-value-stderr.txt | 44 +++++++++
.../IMPORTED_LIBNAME-bad-value.cmake | 6 ++
.../IMPORTED_LIBNAME-non-iface-result.txt} | 0
.../IMPORTED_LIBNAME-non-iface-stderr.txt | 45 +++++++++
.../IMPORTED_LIBNAME-non-iface.cmake | 17 ++++
.../IMPORTED_LIBNAME-non-imported-result.txt} | 0
.../IMPORTED_LIBNAME-non-imported-stderr.txt | 21 ++++
.../IMPORTED_LIBNAME-non-imported.cmake | 5 +
.../RunCMake/interface_library/RunCMakeTest.cmake | 3 +
21 files changed, 290 insertions(+), 25 deletions(-)
create mode 100644 Help/prop_tgt/IMPORTED_LIBNAME.rst
create mode 100644 Help/prop_tgt/IMPORTED_LIBNAME_CONFIG.rst
create mode 100644 Help/release/dev/imported-interface-libname.rst
create mode 100644 Tests/InterfaceLibrary/item.cpp
create mode 100644 Tests/InterfaceLibrary/item_fake.cpp
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => interface_library/IMPORTED_LIBNAME-bad-value-result.txt} (100%)
create mode 100644 Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-stderr.txt
create mode 100644 Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => interface_library/IMPORTED_LIBNAME-non-iface-result.txt} (100%)
create mode 100644 Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface-stderr.txt
create mode 100644 Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => interface_library/IMPORTED_LIBNAME-non-imported-result.txt} (100%)
create mode 100644 Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported-stderr.txt
create mode 100644 Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list