Skip to content

build: obsolete INTERFACE_LINK_LIBRARIES #24507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2019
Merged

build: obsolete INTERFACE_LINK_LIBRARIES #24507

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,6 @@ function(_add_swift_library_single target name)
GYB_SOURCES
INCORPORATE_OBJECT_LIBRARIES
INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY
INTERFACE_LINK_LIBRARIES
LINK_FLAGS
LINK_LIBRARIES
LLVM_COMPONENT_DEPENDS
Expand Down Expand Up @@ -892,7 +891,6 @@ function(_add_swift_library_single target name)
${SWIFTLIB_SINGLE_DEPENDS}
${SWIFTLIB_SINGLE_FILE_DEPENDS}
${SWIFTLIB_SINGLE_LINK_LIBRARIES}
${SWIFTLIB_SINGLE_INTERFACE_LINK_LIBRARIES}
SDK ${SWIFTLIB_SINGLE_SDK}
ARCHITECTURE ${SWIFTLIB_SINGLE_ARCHITECTURE}
MODULE_NAME ${module_name}
Expand Down Expand Up @@ -1313,7 +1311,7 @@ function(_add_swift_library_single target name)
# import library targets when the library was added. Use that to adjust the
# link libraries.
if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS AND NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
foreach(library_list LINK_LIBRARIES INTERFACE_LINK_LIBRARIES PRIVATE_LINK_LIBRARIES)
foreach(library_list LINK_LIBRARIES PRIVATE_LINK_LIBRARIES)
set(import_libraries)
foreach(library ${SWIFTLIB_SINGLE_${library_list}})
# Ensure that the library is a target. If an absolute path was given,
Expand Down Expand Up @@ -1342,14 +1340,6 @@ function(_add_swift_library_single target name)
target_link_libraries("${target}" PRIVATE
${SWIFTLIB_SINGLE_PRIVATE_LINK_LIBRARIES})
endif()
if("${libkind}" STREQUAL "OBJECT")
precondition_list_empty(
"${SWIFTLIB_SINGLE_INTERFACE_LINK_LIBRARIES}"
"OBJECT_LIBRARY may not link to anything")
else()
target_link_libraries("${target}" INTERFACE
${SWIFTLIB_SINGLE_INTERFACE_LINK_LIBRARIES})
endif()

set_property(TARGET "${target}" PROPERTY
LINKER_LANGUAGE "CXX")
Expand Down Expand Up @@ -1407,7 +1397,6 @@ function(add_swift_host_library name)
C_COMPILE_FLAGS
DEPENDS
FILE_DEPENDS
INTERFACE_LINK_LIBRARIES
LINK_LIBRARIES
LLVM_COMPONENT_DEPENDS)

Expand All @@ -1424,9 +1413,6 @@ function(add_swift_host_library name)
if(ASHL_DEPENDS)
message(SEND_ERROR "library ${name} is using DEPENDS parameter which is deprecated. Please use add_dependencies instead")
endif()
if(ASHL_INTERFACE_LINK_LIBRARIES)
message(SEND_ERROR "library ${name} is using INTERFACE_LINK_LIBRARIES parameter which is deprecated. Please use target_link_libraries instead.")
endif()
if(ASHL_LINK_LIBRARIES)
message(SEND_ERROR "library ${name} is using LINK_LIBRARIES parameter which is deprecated. Please use target_link_libraries instead")
endif()
Expand Down Expand Up @@ -1478,7 +1464,6 @@ endfunction()
# [STATIC]
# [DEPENDS dep1 ...]
# [LINK_LIBRARIES dep1 ...]
# [INTERFACE_LINK_LIBRARIES dep1 ...]
# [SWIFT_MODULE_DEPENDS dep1 ...]
# [FRAMEWORK_DEPENDS dep1 ...]
# [FRAMEWORK_DEPENDS_WEAK dep1 ...]
Expand Down Expand Up @@ -1631,7 +1616,6 @@ function(add_swift_target_library name)
GYB_SOURCES
INCORPORATE_OBJECT_LIBRARIES
INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY
INTERFACE_LINK_LIBRARIES
LINK_FLAGS
LINK_LIBRARIES
LLVM_COMPONENT_DEPENDS
Expand Down