浏览代码

Merge topic 'fix-export-link-interfaces' into release-4.2

b209c41dfa export(TARGETS): Restore EXPORT_LINK_INTERFACE_LIBRARIES

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !11309
Brad King 5 天之前
父节点
当前提交
b230eb2302

+ 2 - 1
Source/cmExportCommand.cxx

@@ -72,7 +72,8 @@ static bool HandleTargetsMode(std::vector<std::string> const& args,
       .Bind("CXX_MODULES_DIRECTORY"_s, &Arguments::CxxModulesDirectory)
       .Bind("CXX_MODULES_DIRECTORY"_s, &Arguments::CxxModulesDirectory)
       .Bind("TARGETS"_s, &Arguments::Targets)
       .Bind("TARGETS"_s, &Arguments::Targets)
       .Bind("APPEND"_s, &Arguments::Append)
       .Bind("APPEND"_s, &Arguments::Append)
-      .Bind("ANDROID_MK"_s, &Arguments::AndroidMKFile);
+      .Bind("ANDROID_MK"_s, &Arguments::AndroidMKFile)
+      .Bind("EXPORT_LINK_INTERFACE_LIBRARIES"_s, &Arguments::ExportOld);
 
 
   std::vector<std::string> unknownArgs;
   std::vector<std::string> unknownArgs;
   Arguments arguments = parser.Parse(args, &unknownArgs);
   Arguments arguments = parser.Parse(args, &unknownArgs);

+ 6 - 0
Tests/RunCMake/export/ExportLinkInterfaces.cmake

@@ -0,0 +1,6 @@
+enable_language(CXX)
+add_library(foo empty.cpp)
+
+export(TARGETS foo
+  EXPORT_LINK_INTERFACE_LIBRARIES
+)

+ 1 - 0
Tests/RunCMake/export/RunCMakeTest.cmake

@@ -13,6 +13,7 @@ run_cmake(ForbiddenToExportInterfaceProperties)
 run_cmake(ForbiddenToExportImportedProperties)
 run_cmake(ForbiddenToExportImportedProperties)
 run_cmake(ForbiddenToExportPropertyWithGenExp)
 run_cmake(ForbiddenToExportPropertyWithGenExp)
 run_cmake(ExportPropertiesUndefined)
 run_cmake(ExportPropertiesUndefined)
+run_cmake(ExportLinkInterfaces)
 run_cmake(DependOnNotExport)
 run_cmake(DependOnNotExport)
 run_cmake(DependOnDoubleExport)
 run_cmake(DependOnDoubleExport)
 run_cmake(DependOnDifferentSetExport)
 run_cmake(DependOnDifferentSetExport)