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 419cba0e392565b3d24c0be7a4d7a27416df0075 (commit)
via d3d2ded3f8a4fc117241b2212a5fd6b9bb616a3c (commit)
from aaa9af32fa233cb1497c65e912ea3d27c3dcf430 (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=419cba0e392565b3d24c0be7a4d7a27416df0075
commit 419cba0e392565b3d24c0be7a4d7a27416df0075
Merge: aaa9af3 d3d2ded
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 1 09:19:32 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jun 1 09:19:32 2015 -0400
Merge topic 'imported-interface-libname' into next
d3d2ded3 Revert topic 'imported-interface-libname'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3d2ded3f8a4fc117241b2212a5fd6b9bb616a3c
commit d3d2ded3f8a4fc117241b2212a5fd6b9bb616a3c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 1 09:19:13 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jun 1 09:19:13 2015 -0400
Revert topic 'imported-interface-libname'
It will be revised and restored after more design discussion.
diff --git a/Help/manual/cmake-properties.7.rst
b/Help/manual/cmake-properties.7.rst
index 9bbecec..615254e 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -142,8 +142,6 @@ 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
deleted file mode 100644
index 1943dba..0000000
--- a/Help/prop_tgt/IMPORTED_LIBNAME.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-IMPORTED_LIBNAME
-----------------
-
-Specify the link library name for an :ref:`imported <Imported Targets>`
-:ref:`Interface Library <Interface Libraries>`.
-
-An interface library builds no library file itself but does specify
-usage requirements for its consumers. The ``IMPORTED_LIBNAME``
-property may be set to specify a single library name to be placed
-on the link line in place of the interface library target name as
-a requirement for using the interface.
-
-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
deleted file mode 100644
index a28b838..0000000
--- a/Help/prop_tgt/IMPORTED_LIBNAME_CONFIG.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index fdbae78..0000000
--- a/Help/release/dev/imported-interface-libname.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-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 build their own library files.
diff --git a/Source/cmComputeLinkInformation.cxx
b/Source/cmComputeLinkInformation.cxx
index 53abb10..e6cbe60 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -658,13 +658,6 @@ 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 ac70138..70005b4 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -77,7 +77,6 @@ struct cmTarget::ImportInfo
std::string Location;
std::string SOName;
std::string ImportLibrary;
- std::string LibName;
std::string Languages;
std::string Libraries;
std::string LibrariesProp;
@@ -365,6 +364,11 @@ 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);
@@ -1671,10 +1675,7 @@ static bool whiteListedInterfaceProperty(const
std::string& prop)
return true;
}
- if (prop == "IMPORTED_CONFIGURATIONS" ||
- prop == "IMPORTED_LIBNAME" ||
- cmHasLiteralPrefix(prop, "IMPORTED_LIBNAME_") ||
- cmHasLiteralPrefix(prop, "MAP_IMPORTED_CONFIG_"))
+ if (cmHasLiteralPrefix(prop, "MAP_IMPORTED_CONFIG_"))
{
return true;
}
@@ -1744,11 +1745,6 @@ 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();
@@ -1836,11 +1832,6 @@ 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();
@@ -3846,16 +3837,6 @@ 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
{
@@ -5412,9 +5393,14 @@ bool cmTarget::GetMappedConfig(std::string const&
desired_config,
const char** imp,
std::string& suffix) const
{
- std::string const locPropBase =
- this->GetType() == INTERFACE_LIBRARY?
- "IMPORTED_LIBNAME" : "IMPORTED_LOCATION";
+ 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 = "_";
@@ -5441,7 +5427,7 @@ bool cmTarget::GetMappedConfig(std::string const&
desired_config,
{
// Look for this configuration.
std::string mcUpper = cmSystemTools::UpperCase(*mci);
- std::string locProp = locPropBase + "_";
+ std::string locProp = "IMPORTED_LOCATION_";
locProp += mcUpper;
*loc = this->GetProperty(locProp);
if(allowImp)
@@ -5460,20 +5446,18 @@ bool cmTarget::GetMappedConfig(std::string const&
desired_config,
}
// If we needed to find one of the mapped configurations but did not
- // then the target location is not found. The project does not want
- // any other configuration.
+ // then the target is not found. The project does not want any
+ // other configuration.
if(!mappedConfigs.empty() && !*loc && !*imp)
{
- // 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 false;
}
// If we have not yet found it then there are no mapped
// configurations. Look for an exact-match.
if(!*loc && !*imp)
{
- std::string locProp = locPropBase;
+ std::string locProp = "IMPORTED_LOCATION";
locProp += suffix;
*loc = this->GetProperty(locProp);
if(allowImp)
@@ -5493,7 +5477,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(locPropBase);
+ *loc = this->GetProperty("IMPORTED_LOCATION");
if(allowImp)
{
*imp = this->GetProperty("IMPORTED_IMPLIB");
@@ -5515,7 +5499,7 @@ bool cmTarget::GetMappedConfig(std::string const&
desired_config,
{
suffix = "_";
suffix += cmSystemTools::UpperCase(*aci);
- std::string locProp = locPropBase;
+ std::string locProp = "IMPORTED_LOCATION";
locProp += suffix;
*loc = this->GetProperty(locProp);
if(allowImp)
@@ -5526,13 +5510,10 @@ bool cmTarget::GetMappedConfig(std::string const&
desired_config,
}
}
}
-
- // If we have not yet found it then the target location is not available.
+ // If we have not yet found it then the target is not available.
if(!*loc && !*imp)
{
- // 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 false;
}
return true;
@@ -5585,10 +5566,6 @@ void cmTarget::ComputeImportInfo(std::string const&
desired_config,
}
if(this->GetType() == INTERFACE_LIBRARY)
{
- if (loc)
- {
- info.LibName = loc;
- }
return;
}
@@ -5713,37 +5690,6 @@ 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 with '-'.");
- 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 f5700dc..2150b83 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -435,9 +435,6 @@ 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,
@@ -795,9 +792,6 @@ 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 3db210a..ee81419 100644
--- a/Tests/InterfaceLibrary/CMakeLists.txt
+++ b/Tests/InterfaceLibrary/CMakeLists.txt
@@ -25,25 +25,8 @@ target_sources(iface_objlib INTERFACE
$<TARGET_OBJECTS:objlib>)
add_library(intermediate INTERFACE)
target_link_libraries(intermediate INTERFACE iface_objlib)
-add_library(item_fake_tgt STATIC item_fake.cpp)
-set_property(TARGET item_fake_tgt PROPERTY OUTPUT_NAME item_fake)
-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
-
- item_iface
- item_fake # ensure that 'item_real' is ordered in place of item_iface
- )
-add_dependencies(InterfaceLibrary item_fake_tgt)
+target_link_libraries(InterfaceLibrary iface_nodepends headeriface subiface
intermediate)
add_subdirectory(libsdir)
diff --git a/Tests/InterfaceLibrary/definetestexe.cpp
b/Tests/InterfaceLibrary/definetestexe.cpp
index e6b7f58..9044076 100644
--- a/Tests/InterfaceLibrary/definetestexe.cpp
+++ b/Tests/InterfaceLibrary/definetestexe.cpp
@@ -17,9 +17,8 @@
extern int obj();
extern int sub();
-extern int item();
int main(int,char**)
{
- return obj() + sub() + item();
+ return obj() + sub();
}
diff --git a/Tests/InterfaceLibrary/item.cpp b/Tests/InterfaceLibrary/item.cpp
deleted file mode 100644
index be612c9..0000000
--- a/Tests/InterfaceLibrary/item.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int item() { return 0; }
diff --git a/Tests/InterfaceLibrary/item_fake.cpp
b/Tests/InterfaceLibrary/item_fake.cpp
deleted file mode 100644
index 3944710..0000000
--- a/Tests/InterfaceLibrary/item_fake.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 454c655..0000000
--- a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-stderr.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-^CMake Error at IMPORTED_LIBNAME-bad-value.cmake:[0-9]+ \(set_property\):
- IMPORTED_LIBNAME property value
-
- -flag
-
- may not start with '-'.
-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
deleted file mode 100644
index 1af65b4..0000000
--- a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 3a329d2..0000000
--- a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface-stderr.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-^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
deleted file mode 100644
index fe6841a..0000000
--- a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index e9d94cf..0000000
--- a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported-stderr.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-^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
deleted file mode 100644
index 07a67d7..0000000
--- a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-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 5a6af1d..201daa7 100644
--- a/Tests/RunCMake/interface_library/RunCMakeTest.cmake
+++ b/Tests/RunCMake/interface_library/RunCMakeTest.cmake
@@ -8,6 +8,3 @@ 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)
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 2 -
Help/prop_tgt/IMPORTED_LIBNAME.rst | 23 -----
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 | 19 +---
Tests/InterfaceLibrary/definetestexe.cpp | 3 +-
Tests/InterfaceLibrary/item.cpp | 1 -
Tests/InterfaceLibrary/item_fake.cpp | 2 -
.../IMPORTED_LIBNAME-bad-value-result.txt | 1 -
.../IMPORTED_LIBNAME-bad-value-stderr.txt | 44 ---------
.../IMPORTED_LIBNAME-bad-value.cmake | 6 --
.../IMPORTED_LIBNAME-non-iface-result.txt | 1 -
.../IMPORTED_LIBNAME-non-iface-stderr.txt | 45 ---------
.../IMPORTED_LIBNAME-non-iface.cmake | 17 ----
.../IMPORTED_LIBNAME-non-imported-result.txt | 1 -
.../IMPORTED_LIBNAME-non-imported-stderr.txt | 21 ----
.../IMPORTED_LIBNAME-non-imported.cmake | 5 -
.../RunCMake/interface_library/RunCMakeTest.cmake | 3 -
21 files changed, 25 insertions(+), 296 deletions(-)
delete mode 100644 Help/prop_tgt/IMPORTED_LIBNAME.rst
delete mode 100644 Help/prop_tgt/IMPORTED_LIBNAME_CONFIG.rst
delete mode 100644 Help/release/dev/imported-interface-libname.rst
delete mode 100644 Tests/InterfaceLibrary/item.cpp
delete mode 100644 Tests/InterfaceLibrary/item_fake.cpp
delete mode 100644
Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-result.txt
delete mode 100644
Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-stderr.txt
delete mode 100644
Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value.cmake
delete mode 100644
Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface-result.txt
delete mode 100644
Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface-stderr.txt
delete mode 100644
Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-iface.cmake
delete mode 100644
Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported-result.txt
delete mode 100644
Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported-stderr.txt
delete mode 100644
Tests/RunCMake/interface_library/IMPORTED_LIBNAME-non-imported.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
