[Cmake-commits] CMake branch, next, updated. v3.2.2-2399-g603942d

Brad King brad.king at kitware.com
Fri May 1 09:31:21 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  603942d29753c0c44a1bee603e2cd524d4de6934 (commit)
       via  1bef1f55402d3c230c41d3cc6cfa0520ff17e5aa (commit)
      from  e6c6584e5662e83f7a3e056ae246a1d589085c67 (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=603942d29753c0c44a1bee603e2cd524d4de6934
commit 603942d29753c0c44a1bee603e2cd524d4de6934
Merge: e6c6584 1bef1f5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 1 09:31:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 1 09:31:20 2015 -0400

    Merge topic 'interface-link-items' into next
    
    1bef1f55 Revert "Allow INTERFACE libraries to specify link items"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bef1f55402d3c230c41d3cc6cfa0520ff17e5aa
commit 1bef1f55402d3c230c41d3cc6cfa0520ff17e5aa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 1 09:15:59 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 1 09:15:59 2015 -0400

    Revert "Allow INTERFACE libraries to specify link items"
    
    This reverts commit e4adad1e496cae86b484fb49e22e661f49c1f9a5.
    The feature will be redesigned in the future.

diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst
index 079e89e..ae5e58e 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -819,10 +819,9 @@ It may specify usage requirements such as
 :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES`,
 :prop_tgt:`INTERFACE_COMPILE_DEFINITIONS`,
 :prop_tgt:`INTERFACE_COMPILE_OPTIONS`,
-:prop_tgt:`INTERFACE_LINK_LIBRARIES`,
+:prop_tgt:`INTERFACE_LINK_LIBRARIES`, and
 :prop_tgt:`INTERFACE_SOURCES`,
-:prop_tgt:`INTERFACE_POSITION_INDEPENDENT_CODE`,
-and :prop_tgt:`INTERFACE_LINK_ITEMS`.
+:prop_tgt:`INTERFACE_POSITION_INDEPENDENT_CODE`.
 Only the ``INTERFACE`` modes of the :command:`target_include_directories`,
 :command:`target_compile_definitions`, :command:`target_compile_options`,
 :command:`target_sources`, and :command:`target_link_libraries` commands
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index bed1c38..02d164b 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -168,7 +168,6 @@ Properties on Targets
    /prop_tgt/INTERFACE_COMPILE_FEATURES
    /prop_tgt/INTERFACE_COMPILE_OPTIONS
    /prop_tgt/INTERFACE_INCLUDE_DIRECTORIES
-   /prop_tgt/INTERFACE_LINK_ITEMS
    /prop_tgt/INTERFACE_LINK_LIBRARIES
    /prop_tgt/INTERFACE_POSITION_INDEPENDENT_CODE
    /prop_tgt/INTERFACE_SOURCES
diff --git a/Help/prop_tgt/INTERFACE_LINK_ITEMS.rst b/Help/prop_tgt/INTERFACE_LINK_ITEMS.rst
deleted file mode 100644
index dc10a8f..0000000
--- a/Help/prop_tgt/INTERFACE_LINK_ITEMS.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-INTERFACE_LINK_ITEMS
---------------------
-
-Specify link line items for an :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 ``INTERFACE_LINK_ITEMS`` property specifies a
-:ref:`;-list <CMake Language Lists>` of items to be placed on the
-link line in place of the interface library.  One may use
-:manual:`generator expressions <cmake-generator-expressions(7)>`.
-Each item may be:
-
-* A full path to a library file such as ``/usr/lib/libfoo.so``.
-* A plain library name such as ``foo``.
-* A link flag.
-
-See the :command:`target_link_libraries` command for details on
-how each type of item is treated, but note that the
-``INTERFACE_LINK_ITEMS`` property does not recognize the keyword
-arguments of that command.  Furthermore, items specified in this
-property are *not* treated as library target names even if they
-happen to name one.  Items may *not* contain ``::`` because CMake
-assumes such names refer to :ref:`Alias Targets` or
-:ref:`Imported Targets` whether they are defined or not.
-
-The ``INTERFACE_LINK_ITEMS`` property is allowed only on
-:ref:`Interface Libraries` and is rejected on targets of other
-types.
diff --git a/Help/release/dev/interface-link-items.rst b/Help/release/dev/interface-link-items.rst
deleted file mode 100644
index 6b84918..0000000
--- a/Help/release/dev/interface-link-items.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-interface-link-items
---------------------
-
-* :ref:`Interface Libraries` learned a new :prop_tgt:`INTERFACE_LINK_ITEMS`
-  target property to specify link line items since interface libraries do
-  not have their own library files.
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 8cda169..6ecf0dc 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -659,16 +659,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 items the interface specifies to be used in its place.
-      std::vector<std::string> ifaceLinkItems;
-      tgt->GetInterfaceLinkItems(ifaceLinkItems, config);
-      for (std::vector<std::string>::iterator i = ifaceLinkItems.begin(),
-             e = ifaceLinkItems.end(); i != e; ++i)
-        {
-        this->AddItem(*i, 0);
-        this->CheckInterfaceLinkItem(tgt, *i);
-        }
       }
     else
       {
@@ -1576,24 +1566,6 @@ void cmComputeLinkInformation::HandleBadFullItem(std::string const& item,
 }
 
 //----------------------------------------------------------------------------
-void cmComputeLinkInformation::CheckInterfaceLinkItem(cmTarget const* target,
-                                                      std::string const& item)
-{
-  if (item.find("::") == item.npos)
-    {
-    return;
-    }
-  std::ostringstream e;
-  e <<
-    "INTERFACE library \"" << target->GetName() << "\" has an invalid "
-    "INTERFACE_LINK_ITEMS entry \"" << item << "\".  "
-    "Entries may not contain \"::\"."
-    ;
-  this->CMakeInstance->IssueMessage(cmake::FATAL_ERROR, e.str(),
-                                    target->GetBacktrace());
-}
-
-//----------------------------------------------------------------------------
 bool cmComputeLinkInformation::FinishLinkerSearchDirectories()
 {
   // Support broken projects if necessary.
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index e847cf3..8847141 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -147,7 +147,6 @@ private:
   bool CheckSharedLibNoSOName(std::string const& item);
   void AddSharedLibNoSOName(std::string const& item);
   void HandleBadFullItem(std::string const& item, std::string const& file);
-  void CheckInterfaceLinkItem(cmTarget const* target, std::string const& item);
 
   // Framework info.
   void ComputeFrameworkInfo();
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 8ae3fb5..b1203dd 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -92,9 +92,6 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_FEATURES", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_LINK_ITEMS", te,
-                                    cmGeneratorExpression::BuildInterface,
-                                    properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   te, properties);
     const bool newCMP0022Behavior =
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index d137d91..6d639c9 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -125,7 +125,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
   bool require2_8_12 = false;
   bool require3_0_0 = false;
   bool require3_1_0 = false;
-  bool require3_3_0 = false;
   bool requiresConfigFiles = false;
   // Create all the imported targets.
   for(std::vector<cmTargetExport*>::const_iterator
@@ -167,10 +166,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
                                   te,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_LINK_ITEMS",
-                                  te,
-                                  cmGeneratorExpression::InstallInterface,
-                                  properties, missingTargets);
 
     const bool newCMP0022Behavior =
                               te->GetPolicyStatusCMP0022() != cmPolicies::WARN
@@ -195,10 +190,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       // can consume them.
       require3_1_0 = true;
       }
-    if(te->GetProperty("INTERFACE_LINK_ITEMS"))
-      {
-      require3_3_0 = true;
-      }
 
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   te, properties);
@@ -207,11 +198,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->GenerateInterfaceProperties(te, os, properties);
     }
 
-  if (require3_3_0)
-    {
-    this->GenerateRequiredCMakeVersion(os, DEVEL_CMAKE_VERSION(3,3));
-    }
-  else if (require3_1_0)
+  if (require3_1_0)
     {
     this->GenerateRequiredCMakeVersion(os, "3.1.0");
     }
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 060ec33..f69e9ae 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1762,14 +1762,6 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
           << this->Name << "\")\n";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
     }
-  else if(prop == "INTERFACE_LINK_ITEMS" &&
-          this->GetType() != cmTarget::INTERFACE_LIBRARY)
-    {
-    std::ostringstream e;
-    e << "INTERFACE_LINK_ITEMS property may be set only on "
-      << "INTERFACE library targets.\n";
-    this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
-    }
   else if (prop == "LINK_LIBRARIES")
     {
     this->Internal->LinkImplementationPropertyEntries.clear();
@@ -1857,14 +1849,6 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
           << this->Name << "\")\n";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
     }
-  else if(prop == "INTERFACE_LINK_ITEMS" &&
-          this->GetType() != cmTarget::INTERFACE_LIBRARY)
-    {
-    std::ostringstream e;
-    e << "INTERFACE_LINK_ITEMS property may be set only on "
-      << "INTERFACE library targets.\n";
-    this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
-    }
   else if (prop == "LINK_LIBRARIES")
     {
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
@@ -2516,28 +2500,6 @@ void cmTarget::GetCompileFeatures(std::vector<std::string> &result,
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::GetInterfaceLinkItems(std::vector<std::string> &items,
-                                     std::string const& config) const
-{
-  const char *prop = this->GetProperty("INTERFACE_LINK_ITEMS");
-  if (!prop)
-    {
-    return;
-    }
-  cmGeneratorExpression ge;
-  cmGeneratorExpressionDAGChecker dagChecker(
-                                      this->GetName(),
-                                      "INTERFACE_LINK_ITEMS", 0, 0);
-  cmSystemTools::ExpandListArgument(ge.Parse(prop)
-                                      ->Evaluate(this->Makefile,
-                                                config,
-                                                false,
-                                                this,
-                                                &dagChecker),
-                                    items);
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::MaybeInvalidatePropertyCache(const std::string& prop)
 {
   // Wipe out maps caching information affected by this property.
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 882372b..a032414 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -587,9 +587,6 @@ public:
   void GetCompileFeatures(std::vector<std::string> &features,
                           const std::string& config) const;
 
-  void GetInterfaceLinkItems(std::vector<std::string> &items,
-                             std::string const& config) const;
-
   bool IsNullImpliedByLinkLibraries(const std::string &p) const;
   bool IsLinkInterfaceDependentBoolProperty(const std::string &p,
                          const std::string& config) const;
diff --git a/Tests/ExportImport/Export/Interface/CMakeLists.txt b/Tests/ExportImport/Export/Interface/CMakeLists.txt
index 2e6fcfc..00a5375 100644
--- a/Tests/ExportImport/Export/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Export/Interface/CMakeLists.txt
@@ -1,9 +1,3 @@
-add_library(item STATIC item.cpp)
-add_library(item_iface INTERFACE)
-set_property(TARGET item_iface PROPERTY INTERFACE_LINK_ITEMS
-  $<TARGET_FILE:$<TARGET_NAME:item>>
-)
-add_dependencies(item_iface item)
 
 add_library(headeronly INTERFACE)
 set_property(TARGET headeronly PROPERTY INTERFACE_INCLUDE_DIRECTORIES
@@ -27,7 +21,7 @@ set_property(TARGET sharedlib PROPERTY INTERFACE_INCLUDE_DIRECTORIES
 set_property(TARGET sharedlib PROPERTY INTERFACE_COMPILE_DEFINITIONS "SHAREDLIB_DEFINE")
 
 add_library(sharediface INTERFACE)
-target_link_libraries(sharediface INTERFACE sharedlib item_iface)
+target_link_libraries(sharediface INTERFACE sharedlib)
 
 add_library(use_auto_type INTERFACE)
 target_compile_features(use_auto_type INTERFACE cxx_auto_type)
@@ -46,11 +40,9 @@ install(FILES
 )
 
 install(TARGETS headeronly sharediface use_auto_type use_c_restrict source_target
-                item_iface
   EXPORT expInterface
 )
 install(TARGETS sharedlib
-                item
   EXPORT expInterface
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib NAMELINK_SKIP
diff --git a/Tests/ExportImport/Export/Interface/item.cpp b/Tests/ExportImport/Export/Interface/item.cpp
deleted file mode 100644
index be612c9..0000000
--- a/Tests/ExportImport/Export/Interface/item.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int item() { return 0; }
diff --git a/Tests/ExportImport/Import/Interface/interfacetest.cpp b/Tests/ExportImport/Import/Interface/interfacetest.cpp
index f9d2bd9..786458d 100644
--- a/Tests/ExportImport/Import/Interface/interfacetest.cpp
+++ b/Tests/ExportImport/Import/Interface/interfacetest.cpp
@@ -13,12 +13,8 @@
 #error Expected DEFINE_IFACE_DEFINE
 #endif
 
-extern int item();
-
 int main(int,char**)
 {
   SharedLibObject slo;
-  return slo.foo()
-    + item()
-    ;
+  return slo.foo();
 }
diff --git a/Tests/InterfaceLibrary/CMakeLists.txt b/Tests/InterfaceLibrary/CMakeLists.txt
index 6fa0016..ee81419 100644
--- a/Tests/InterfaceLibrary/CMakeLists.txt
+++ b/Tests/InterfaceLibrary/CMakeLists.txt
@@ -25,22 +25,8 @@ target_sources(iface_objlib INTERFACE $<TARGET_OBJECTS:objlib>)
 add_library(intermediate INTERFACE)
 target_link_libraries(intermediate INTERFACE iface_objlib)
 
-add_library(item STATIC item.cpp)
-add_library(item_iface INTERFACE)
-set_property(TARGET item_iface PROPERTY INTERFACE_LINK_ITEMS $<TARGET_FILE:item>)
-add_dependencies(item_iface item)
-add_library(item_fake STATIC item_fake.cpp)
-
 add_executable(InterfaceLibrary definetestexe.cpp)
-target_link_libraries(InterfaceLibrary
-  iface_nodepends
-  headeriface
-  subiface
-  intermediate
-
-  item_iface
-  item_fake # ensure that 'item' is ordered in place of item_iface
-  )
+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/INTERFACE_LINK_ITEMS-invalid_item-result.txt b/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-invalid_item-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-invalid_item-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-invalid_item-stderr.txt b/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-invalid_item-stderr.txt
deleted file mode 100644
index d2c0a30..0000000
--- a/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-invalid_item-stderr.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-^(CMake Error at INTERFACE_LINK_ITEMS-invalid_item.cmake:[0-9]+ \(add_library\):
-  INTERFACE library "SomeIFace" has an invalid INTERFACE_LINK_ITEMS entry
-  "bad::item".  Entries may not contain "::".
-Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
-*)+$
diff --git a/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-invalid_item.cmake b/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-invalid_item.cmake
deleted file mode 100644
index e81a3c9..0000000
--- a/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-invalid_item.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-enable_language(C)
-
-add_library(SomeIFace INTERFACE)
-set_property(TARGET SomeIFace APPEND PROPERTY INTERFACE_LINK_ITEMS bad::item)
-add_executable(main main.c)
-target_link_libraries(main SomeIFace)
diff --git a/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-non-iface-result.txt b/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-non-iface-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-non-iface-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-non-iface-stderr.txt b/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-non-iface-stderr.txt
deleted file mode 100644
index 9609b94..0000000
--- a/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-non-iface-stderr.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-^CMake Error at INTERFACE_LINK_ITEMS-non-iface.cmake:[0-9]+ \(set_property\):
-  INTERFACE_LINK_ITEMS property may be set only on INTERFACE library targets.
-
-Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
-+
-CMake Error at INTERFACE_LINK_ITEMS-non-iface.cmake:[0-9]+ \(set_property\):
-  INTERFACE_LINK_ITEMS property may be set only on INTERFACE library targets.
-
-Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-non-iface.cmake b/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-non-iface.cmake
deleted file mode 100644
index 49b1e53..0000000
--- a/Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-non-iface.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-add_custom_target(MyTarget)
-set_property(TARGET MyTarget PROPERTY INTERFACE_LINK_ITEMS item1)
-set_property(TARGET MyTarget APPEND PROPERTY INTERFACE_LINK_ITEMS item2)
diff --git a/Tests/RunCMake/interface_library/RunCMakeTest.cmake b/Tests/RunCMake/interface_library/RunCMakeTest.cmake
index 2679ceb..201daa7 100644
--- a/Tests/RunCMake/interface_library/RunCMakeTest.cmake
+++ b/Tests/RunCMake/interface_library/RunCMakeTest.cmake
@@ -8,5 +8,3 @@ run_cmake(invalid_signature)
 run_cmake(global-interface)
 run_cmake(genex_link)
 run_cmake(add_custom_command-TARGET)
-run_cmake(INTERFACE_LINK_ITEMS-non-iface)
-run_cmake(INTERFACE_LINK_ITEMS-invalid_item)
diff --git a/Tests/RunCMake/interface_library/main.c b/Tests/RunCMake/interface_library/main.c
deleted file mode 100644
index 78f2de1..0000000
--- a/Tests/RunCMake/interface_library/main.c
+++ /dev/null
@@ -1 +0,0 @@
-int main(void) { return 0; }

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

Summary of changes:
 Help/manual/cmake-buildsystem.7.rst                |    5 ++-
 Help/manual/cmake-properties.7.rst                 |    1 -
 Help/prop_tgt/INTERFACE_LINK_ITEMS.rst             |   29 ---------------
 Help/release/dev/interface-link-items.rst          |    6 ----
 Source/cmComputeLinkInformation.cxx                |   28 ---------------
 Source/cmComputeLinkInformation.h                  |    1 -
 Source/cmExportBuildFileGenerator.cxx              |    3 --
 Source/cmExportInstallFileGenerator.cxx            |   15 +-------
 Source/cmTarget.cxx                                |   38 --------------------
 Source/cmTarget.h                                  |    3 --
 Tests/ExportImport/Export/Interface/CMakeLists.txt |   10 +-----
 Tests/ExportImport/Export/Interface/item.cpp       |    1 -
 .../Import/Interface/interfacetest.cpp             |    6 +---
 Tests/InterfaceLibrary/CMakeLists.txt              |   16 +--------
 Tests/InterfaceLibrary/definetestexe.cpp           |    3 +-
 Tests/InterfaceLibrary/item.cpp                    |    1 -
 Tests/InterfaceLibrary/item_fake.cpp               |    2 --
 .../INTERFACE_LINK_ITEMS-invalid_item-result.txt   |    1 -
 .../INTERFACE_LINK_ITEMS-invalid_item-stderr.txt   |    6 ----
 .../INTERFACE_LINK_ITEMS-invalid_item.cmake        |    6 ----
 .../INTERFACE_LINK_ITEMS-non-iface-result.txt      |    1 -
 .../INTERFACE_LINK_ITEMS-non-iface-stderr.txt      |   11 ------
 .../INTERFACE_LINK_ITEMS-non-iface.cmake           |    3 --
 .../RunCMake/interface_library/RunCMakeTest.cmake  |    2 --
 Tests/RunCMake/interface_library/main.c            |    1 -
 25 files changed, 7 insertions(+), 192 deletions(-)
 delete mode 100644 Help/prop_tgt/INTERFACE_LINK_ITEMS.rst
 delete mode 100644 Help/release/dev/interface-link-items.rst
 delete mode 100644 Tests/ExportImport/Export/Interface/item.cpp
 delete mode 100644 Tests/InterfaceLibrary/item.cpp
 delete mode 100644 Tests/InterfaceLibrary/item_fake.cpp
 delete mode 100644 Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-invalid_item-result.txt
 delete mode 100644 Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-invalid_item-stderr.txt
 delete mode 100644 Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-invalid_item.cmake
 delete mode 100644 Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-non-iface-result.txt
 delete mode 100644 Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-non-iface-stderr.txt
 delete mode 100644 Tests/RunCMake/interface_library/INTERFACE_LINK_ITEMS-non-iface.cmake
 delete mode 100644 Tests/RunCMake/interface_library/main.c


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list