kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not export INTERFACE_LINK_LIBRARIES from non-linkable targets 

When cmExportFileGenerator::SetImportLinkInterface exports the old
LINK_INTERFACE_LIBRARIES property values it skips doing so for
non-linkable targets because target->GetLinkInterface returns NULL for
such targets.

Since cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty
looks at the INTERFACE_LINK_LIBRARIES property directly instead of using
the computed link interface, teach it to skip exporting the property if
target->IsLinkable returns false.

Extend the RunCMake.CMP0022 test with a case covering this.  Simply
export an executable target that links to a library that is not
exported.
This commit is contained in:
Brad King 2013-11-02 14:49:49 -04:00
parent ef10b87cc1
commit 23d21b78e1
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmExportFileGenerator.cxx
View File

@ -185,6 +185,10 @@ bool cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty(
ImportPropertyMap &properties, ImportPropertyMap &properties,
std::vector<std::string> &missingTargets) std::vector<std::string> &missingTargets)
{ {
if(!target->IsLinkable())
{
return false;
}
const char *input = target->GetProperty("INTERFACE_LINK_LIBRARIES"); const char *input = target->GetProperty("INTERFACE_LINK_LIBRARIES");
if (input) if (input)
{ {

1
Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt Normal file
View File

@ -0,0 +1 @@
^$

9
Tests/RunCMake/CMP0022/CMP0022-export-exe.cmake Normal file
View File

@ -0,0 +1,9 @@
enable_language(CXX)
cmake_policy(SET CMP0022 NEW)
add_library(testLib empty_vs6_1.cpp)
add_executable(testExe empty_vs6_2.cpp)
target_link_libraries(testExe testLib)
export(TARGETS testExe FILE "${CMAKE_CURRENT_BINARY_DIR}/cmp0022NEW-exe.cmake")

1
Tests/RunCMake/CMP0022/RunCMakeTest.cmake
View File

@ -8,4 +8,5 @@ run_cmake(CMP0022-NOWARN-shared)
run_cmake(CMP0022-NOWARN-static) run_cmake(CMP0022-NOWARN-static)
run_cmake(CMP0022-NOWARN-static-link_libraries) run_cmake(CMP0022-NOWARN-static-link_libraries)
run_cmake(CMP0022-export) run_cmake(CMP0022-export)
run_cmake(CMP0022-export-exe)
run_cmake(CMP0022-install-export) run_cmake(CMP0022-install-export)