mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

target_link_libraries: Fix static library private deps in other dirs

Browse Source 
In commit a1ad0a699b (target_link_libraries: Allow use with targets in
other directories, 2018-09-07, v3.13.0-rc1~94^2) we accidentally broke
the logic that adds `$<LINK_ONLY:...>` to private dependencies of static
libraries in their `INTERFACE_LINK_LIBRARIES` in the case that the
dependency is added from outside the directory creating the library.
The check for a valid target name should apply to the original name
specified by the caller and not the encoded cross-directory reference.

Fixes: #19197
This commit is contained in:
Brad King
2019-04-30 13:18:47 -04:00
parent 30c3effa89
commit 3d3713121b
5 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmTargetLinkLibrariesCommand.cxx
View File

@@ -452,8 +452,8 @@ bool cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
if (this->Target->GetType() == cmStateEnums::STATIC_LIBRARY) { if (this->Target->GetType() == cmStateEnums::STATIC_LIBRARY) {
std::string configLib = std::string configLib =
this->Target->GetDebugGeneratorExpressions(libRef, llt); this->Target->GetDebugGeneratorExpressions(libRef, llt);
if (cmGeneratorExpression::IsValidTargetName(libRef) || if (cmGeneratorExpression::IsValidTargetName(lib) ||
cmGeneratorExpression::Find(libRef) != std::string::npos) { cmGeneratorExpression::Find(lib) != std::string::npos) {
configLib = "$<LINK_ONLY:" + configLib + ">"; configLib = "$<LINK_ONLY:" + configLib + ">";
} }
this->Target->AppendProperty("INTERFACE_LINK_LIBRARIES", this->Target->AppendProperty("INTERFACE_LINK_LIBRARIES",

4
Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
View File

@@ -134,11 +134,15 @@ assert_property(newsignature1 LINK_LIBRARIES "depC;depB;subdirlib")
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Test cross-directory linking. # Test cross-directory linking.
cmake_policy(PUSH) cmake_policy(PUSH)
cmake_policy(SET CMP0022 NEW)
cmake_policy(SET CMP0079 NEW) cmake_policy(SET CMP0079 NEW)
add_executable(TopDir TopDir.c) add_executable(TopDir TopDir.c)
add_subdirectory(SubDirA) add_subdirectory(SubDirA)
add_subdirectory(SubDirB) add_subdirectory(SubDirB)
target_link_libraries(SubDirB TopDirImported) target_link_libraries(SubDirB TopDirImported)
add_subdirectory(SubDirC)
target_link_libraries(SubDirC PRIVATE SubDirC2)
target_link_libraries(TopDir SubDirC)
add_library(TopDirImported IMPORTED INTERFACE) add_library(TopDirImported IMPORTED INTERFACE)
target_compile_definitions(TopDirImported INTERFACE DEF_TopDirImported) target_compile_definitions(TopDirImported INTERFACE DEF_TopDirImported)
cmake_policy(POP) cmake_policy(POP)

9
Tests/CMakeCommands/target_link_libraries/SubDirC/CMakeLists.txt Normal file
View File

@@ -0,0 +1,9 @@
add_library(SubDirC STATIC SubDirC.c)
add_library(SubDirC1 INTERFACE)
target_compile_definitions(SubDirC1 INTERFACE DEF_SubDirC1)
add_library(SubDirC2 INTERFACE)
target_compile_definitions(SubDirC2 INTERFACE DEF_SubDirC2)
target_link_libraries(SubDirC PRIVATE SubDirC1)

11
Tests/CMakeCommands/target_link_libraries/SubDirC/SubDirC.c Normal file
View File

@@ -0,0 +1,11 @@
#ifndef DEF_SubDirC1
# error "DEF_SubDirC1 not defined"
#endif
#ifndef DEF_SubDirC2
# error "DEF_SubDirC2 not defined"
#endif
int SubDirC(void)
{
return 0;
}

6
Tests/CMakeCommands/target_link_libraries/TopDir.c
View File

@@ -7,6 +7,12 @@
#ifdef DEF_TopDirImported #ifdef DEF_TopDirImported
# error "DEF_TopDirImported is defined but should not be!" # error "DEF_TopDirImported is defined but should not be!"
#endif #endif
#ifdef DEF_SubDirC1
# error "DEF_SubDirC1 defined but should not be"
#endif
#ifdef DEF_SubDirC2
# error "DEF_SubDirC2 defined but should not be"
#endif
int main(void) int main(void)
{ {