mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 19:00:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "target_link_libraries: Allow use with targets in other directories"

Browse Source 
Revert commit v3.12.0-rc1~82^2 (target_link_libraries: Allow use with
targets in other directories, 2018-05-11).  The RHS target scoping and
visibility rules are not clear and will need further investigation
before the feature can be added.

Issue: #17943
This commit is contained in:
Brad King
2018-07-03 09:37:29 -04:00
parent 51e7d41507
commit 0d7114987c
18 changed files with 10 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Help/command/target_link_libraries.rst
View File

@@ -18,7 +18,7 @@ All of them have the general form::
target_link_libraries(<target> ... <item>... ...)
The named ``<target>`` must have been created by
The named ``<target>`` must have been created in the current directory by
a command such as :command:`add_executable` or :command:`add_library` and
must not be an :ref:`ALIAS target <Alias Targets>`.
Repeated calls for the same ``<target>`` append items in the order called.

3
Help/release/3.12.rst
View File

@@ -81,9 +81,6 @@ Commands
:ref:`Object Libraries`. Linking to an object library uses its object
files in direct dependents and also propagates usage requirements.
* The :command:`target_link_libraries` command may now be called
to modify targets created outside the current directory.
Variables
---------

11
Source/cmTargetLinkLibrariesCommand.cxx
View File

@@ -365,7 +365,7 @@ bool cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
if (this->CurrentProcessingState != ProcessingKeywordLinkInterface &&
this->CurrentProcessingState != ProcessingPlainLinkInterface) {
// Find target on the LHS locally
// Assure that the target on the LHS was created in the current directory.
cmTarget* t =
this->Makefile->FindLocalNonAliasTarget(this->Target->GetName());
if (!t) {
@@ -378,18 +378,11 @@ bool cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
}
}
}
// If no local target has been found, find it in the global scope
if (!t) {
t = this->Makefile->GetGlobalGenerator()->FindTarget(
this->Target->GetName(), true);
}
if (!t) {
std::ostringstream e;
e << "Attempt to add link library \"" << lib << "\" to target \""
<< this->Target->GetName()
<< "\" which does not exist or is an alias target.";
<< "\" which is not built in this directory.";
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
return false;
}

3
Tests/RunCMake/target_link_libraries/RunCMakeTest.cmake
View File

@@ -8,10 +8,7 @@ run_cmake(ImportedTarget)
run_cmake(ImportedTargetFailure)
run_cmake(MixedSignature)
run_cmake(Separate-PRIVATE-LINK_PRIVATE-uses)
run_cmake(SubDirImportedTarget)
run_cmake(SubDirTarget)
run_cmake(SubDirTarget-UNKNOWN-IMPORTED)
run_cmake(SubDirTarget-UNKNOWN-IMPORTED-GLOBAL)
run_cmake(SharedDepNotTarget)
run_cmake(StaticPrivateDepNotExported)
run_cmake(StaticPrivateDepNotTarget)

4
Tests/RunCMake/target_link_libraries/SubDirImportedTarget-stdout.txt
View File

@@ -1,4 +0,0 @@
-- mainexeUnknownImportedGlobal: mainlib;sublib
-- mainlibUnknownImportedGlobal: mainlib;sublib
-- subexeUnknownImportedGlobal: mainlib;sublib
-- sublibUnknownImportedGlobal: mainlib;sublib

17
Tests/RunCMake/target_link_libraries/SubDirImportedTarget.cmake
View File

@@ -1,17 +0,0 @@
enable_language(C)
add_executable(mainexeUnknownImportedGlobal IMPORTED GLOBAL)
add_library(mainlibUnknownImportedGlobal UNKNOWN IMPORTED GLOBAL)
add_library(mainlib empty.c)
add_subdirectory(SubDirImportedTarget)
target_link_libraries(subexeUnknownImportedGlobal INTERFACE mainlib)
target_link_libraries(subexeUnknownImportedGlobal INTERFACE sublib)
get_property(subexeUnknownImportedGlobal_libs TARGET subexeUnknownImportedGlobal PROPERTY INTERFACE_LINK_LIBRARIES)
message(STATUS "subexeUnknownImportedGlobal: ${subexeUnknownImportedGlobal_libs}")
target_link_libraries(sublibUnknownImportedGlobal INTERFACE mainlib)
target_link_libraries(sublibUnknownImportedGlobal INTERFACE sublib)
get_property(sublibUnknownImportedGlobal_libs TARGET sublibUnknownImportedGlobal PROPERTY INTERFACE_LINK_LIBRARIES)
message(STATUS "sublibUnknownImportedGlobal: ${sublibUnknownImportedGlobal_libs}")

13
Tests/RunCMake/target_link_libraries/SubDirImportedTarget/CMakeLists.txt
View File

@@ -1,13 +0,0 @@
add_executable(subexeUnknownImportedGlobal IMPORTED GLOBAL)
add_library(sublibUnknownImportedGlobal UNKNOWN IMPORTED GLOBAL)
add_library(sublib ../empty.c)
target_link_libraries(mainexeUnknownImportedGlobal INTERFACE mainlib)
target_link_libraries(mainexeUnknownImportedGlobal INTERFACE sublib)
get_property(mainexeUnknownImportedGlobal_libs TARGET mainexeUnknownImportedGlobal PROPERTY INTERFACE_LINK_LIBRARIES)
message(STATUS "mainexeUnknownImportedGlobal: ${mainexeUnknownImportedGlobal_libs}")
target_link_libraries(mainlibUnknownImportedGlobal INTERFACE mainlib)
target_link_libraries(mainlibUnknownImportedGlobal INTERFACE sublib)
get_property(mainlibUnknownImportedGlobal_libs TARGET mainlibUnknownImportedGlobal PROPERTY INTERFACE_LINK_LIBRARIES)
message(STATUS "mainlibUnknownImportedGlobal: ${mainlibUnknownImportedGlobal_libs}")

2
Tests/RunCMake/target_link_libraries/SubDirTarget-UNKNOWN-IMPORTED-GLOBAL-stdout.txt
View File

@@ -1,2 +0,0 @@
-- mainexe: mainlibUnknownImportedGlobal;sublibUnknownImportedGlobal
-- subexe: mainlibUnknownImportedGlobal;sublibUnknownImportedGlobal

11
Tests/RunCMake/target_link_libraries/SubDirTarget-UNKNOWN-IMPORTED-GLOBAL.cmake
View File

@@ -1,11 +0,0 @@
enable_language(C)
add_executable(mainexe empty.c)
add_library(mainlibUnknownImportedGlobal UNKNOWN IMPORTED GLOBAL)
add_subdirectory(SubDirTarget-UNKNOWN-IMPORTED-GLOBAL)
target_link_libraries(subexe mainlibUnknownImportedGlobal)
target_link_libraries(subexe sublibUnknownImportedGlobal)
get_property(subexe_libs TARGET subexe PROPERTY INTERFACE_LINK_LIBRARIES)
message(STATUS "subexe: ${subexe_libs}")

7
Tests/RunCMake/target_link_libraries/SubDirTarget-UNKNOWN-IMPORTED-GLOBAL/CMakeLists.txt
View File

@@ -1,7 +0,0 @@
add_executable(subexe ../empty.c)
add_library(sublibUnknownImportedGlobal UNKNOWN IMPORTED GLOBAL)
target_link_libraries(mainexe mainlibUnknownImportedGlobal)
target_link_libraries(mainexe sublibUnknownImportedGlobal)
get_property(mainexe_libs TARGET mainexe PROPERTY INTERFACE_LINK_LIBRARIES)
message(STATUS "mainexe: ${mainexe_libs}")

2
Tests/RunCMake/target_link_libraries/SubDirTarget-UNKNOWN-IMPORTED-stdout.txt
View File

@@ -1,2 +0,0 @@
-- mainexe: mainlibUnknownImported;sublibUnknownImported
-- subexe: mainlibUnknownImported;sublibUnknownImported

11
Tests/RunCMake/target_link_libraries/SubDirTarget-UNKNOWN-IMPORTED.cmake
View File

@@ -1,11 +0,0 @@
enable_language(C)
add_executable(mainexe empty.c)
add_library(mainlibUnknownImported UNKNOWN IMPORTED)
add_subdirectory(SubDirTarget-UNKNOWN-IMPORTED)
target_link_libraries(subexe mainlibUnknownImported)
target_link_libraries(subexe sublibUnknownImported)
get_property(subexe_libs TARGET subexe PROPERTY INTERFACE_LINK_LIBRARIES)
message(STATUS "subexe: ${subexe_libs}")

7
Tests/RunCMake/target_link_libraries/SubDirTarget-UNKNOWN-IMPORTED/CMakeLists.txt
View File

@@ -1,7 +0,0 @@
add_executable(subexe ../empty.c)
add_library(sublibUnknownImported UNKNOWN IMPORTED)
target_link_libraries(mainexe mainlibUnknownImported)
target_link_libraries(mainexe sublibUnknownImported)
get_property(mainexe_libs TARGET mainexe PROPERTY INTERFACE_LINK_LIBRARIES)
message(STATUS "mainexe: ${mainexe_libs}")

1
Tests/RunCMake/target_link_libraries/SubDirTarget-result.txt Normal file
View File

@@ -0,0 +1 @@
1

5
Tests/RunCMake/target_link_libraries/SubDirTarget-stderr.txt Normal file
View File

@@ -0,0 +1,5 @@
^CMake Error at SubDirTarget.cmake:[0-9]+ \(target_link_libraries\):
Attempt to add link library "m" to target "subexe" which is not built in
this directory.
Call Stack \(most recent call first\):
CMakeLists.txt:[0-9]+ \(include\)$

2
Tests/RunCMake/target_link_libraries/SubDirTarget-stdout.txt
View File

@@ -1,2 +0,0 @@
-- mainexe: mainlib;sublib
-- subexe: mainlib;sublib

10
Tests/RunCMake/target_link_libraries/SubDirTarget.cmake
View File

@@ -1,11 +1,3 @@
enable_language(C)
add_executable(mainexe empty.c)
add_library(mainlib empty.c)
add_subdirectory(SubDirTarget)
target_link_libraries(subexe mainlib)
target_link_libraries(subexe sublib)
get_property(subexe_libs TARGET subexe PROPERTY INTERFACE_LINK_LIBRARIES)
message(STATUS "subexe: ${subexe_libs}")
target_link_libraries(subexe m)

6
Tests/RunCMake/target_link_libraries/SubDirTarget/CMakeLists.txt
View File

@@ -1,7 +1 @@
add_executable(subexe ../empty.c)
add_library(sublib ../empty.c)
target_link_libraries(mainexe mainlib)
target_link_libraries(mainexe sublib)
get_property(mainexe_libs TARGET mainexe PROPERTY INTERFACE_LINK_LIBRARIES)
message(STATUS "mainexe: ${mainexe_libs}")