Skip to content

Commit

Permalink
add_swift_host_library: rename LINK_LIBRARIES to LINK_LIBS
Browse files Browse the repository at this point in the history
  • Loading branch information
compnerd committed Oct 31, 2018
1 parent e0b8393 commit 39dde93
Show file tree
Hide file tree
Showing 26 changed files with 33 additions and 30 deletions.
8 changes: 4 additions & 4 deletions cmake/modules/AddSwift.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1322,7 +1322,7 @@ endfunction()
# [SHARED]
# [STATIC]
# [DEPENDS dep1 ...]
# [LINK_LIBRARIES dep1 ...]
# [LINK_LIBS lib1 ...]
# [INTERFACE_LINK_LIBRARIES dep1 ...]
# [SWIFT_MODULE_DEPENDS dep1 ...]
# [LLVM_COMPONENT_DEPENDS comp1 ...]
Expand All @@ -1343,7 +1343,7 @@ endfunction()
# DEPENDS
# Targets that this library depends on.
#
# LINK_LIBRARIES
# LINK_LIBS
# Libraries this library depends on.
#
# LLVM_COMPONENT_DEPENDS
Expand All @@ -1367,7 +1367,7 @@ function(add_swift_host_library name)
DEPENDS
INTERFACE_LINK_LIBRARIES
LINK_FLAGS
LINK_LIBRARIES
LINK_LIBS
LLVM_COMPONENT_DEPENDS)

cmake_parse_arguments(ASHL
Expand All @@ -1392,7 +1392,7 @@ function(add_swift_host_library name)
SDK ${SWIFT_HOST_VARIANT_SDK}
ARCHITECTURE ${SWIFT_HOST_VARIANT_ARCH}
DEPENDS ${ASHL_DEPENDS}
LINK_LIBRARIES ${ASHL_LINK_LIBRARIES}
LINK_LIBRARIES ${ASHL_LINK_LIBS}
LLVM_COMPONENT_DEPENDS ${ASHL_LLVM_COMPONENT_DEPENDS}
LINK_FLAGS ${ASHL_LINK_FLAGS}
INTERFACE_LINK_LIBRARIES ${ASHL_INTERFACE_LINK_LIBRARIES}
Expand Down
2 changes: 1 addition & 1 deletion lib/AST/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ add_swift_host_library(swiftAST STATIC
TypeWalker.cpp
USRGeneration.cpp

LINK_LIBRARIES
LINK_LIBS
swiftMarkup
swiftBasic
swiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion lib/ASTSectionImporter/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
add_swift_host_library(swiftASTSectionImporter STATIC
ASTSectionImporter.cpp
LINK_LIBRARIES swiftBasic
LINK_LIBS swiftBasic
LLVM_COMPONENT_DEPENDS core)

2 changes: 1 addition & 1 deletion lib/Basic/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ add_swift_host_library(swiftBasic STATIC

UnicodeExtendedGraphemeClusters.cpp.gyb

LINK_LIBRARIES
LINK_LIBS
swiftDemangling
${UUID_LIBRARIES}
LLVM_COMPONENT_DEPENDS support)
Expand Down
2 changes: 1 addition & 1 deletion lib/ClangImporter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ add_swift_host_library(swiftClangImporter STATIC
ImportName.cpp
ImportType.cpp
SwiftLookupTable.cpp
LINK_LIBRARIES
LINK_LIBS
swiftAST
swiftParse
)
Expand Down
3 changes: 2 additions & 1 deletion lib/Driver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ set(swiftDriver_targetDefines)
add_swift_host_library(swiftDriver STATIC
${swiftDriver_sources}
DEPENDS SwiftOptions
LINK_LIBRARIES swiftAST swiftBasic swiftOption)
LINK_LIBS
swiftAST swiftBasic swiftOption)

# Generate the static-stdlib-args.lnk file used by -static-stdlib option
# for 'GenericUnix' (eg linux)
Expand Down
2 changes: 1 addition & 1 deletion lib/Frontend/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ add_swift_host_library(swiftFrontend STATIC
SerializedDiagnosticConsumer.cpp
DEPENDS
SwiftOptions
LINK_LIBRARIES
LINK_LIBS
swiftSIL
swiftMigrator
swiftOption
Expand Down
2 changes: 1 addition & 1 deletion lib/FrontendTool/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ add_swift_host_library(swiftFrontendTool STATIC
TBD.cpp
DEPENDS
swift-syntax-generated-headers SwiftOptions
LINK_LIBRARIES
LINK_LIBS
swiftIndex
swiftIDE
swiftTBDGen swiftIRGen swiftSIL swiftSILGen swiftSILOptimizer
Expand Down
2 changes: 1 addition & 1 deletion lib/IDE/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ add_swift_host_library(swiftIDE STATIC
IDETypeChecking.cpp
APIDigesterData.cpp
SourceEntityWalker.cpp
LINK_LIBRARIES
LINK_LIBS
swiftFrontend
swiftClangImporter
swiftParse
Expand Down
2 changes: 1 addition & 1 deletion lib/IRGen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ add_swift_host_library(swiftIRGen STATIC
SwiftTargetInfo.cpp
TypeLayoutDumper.cpp
TypeLayoutVerifier.cpp
LINK_LIBRARIES
LINK_LIBS
swiftAST
swiftLLVMPasses
swiftSIL
Expand Down
2 changes: 1 addition & 1 deletion lib/Immediate/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
add_swift_host_library(swiftImmediate STATIC
Immediate.cpp
REPL.cpp
LINK_LIBRARIES
LINK_LIBS
swiftIDE
swiftFrontend
swiftSILGen
Expand Down
2 changes: 1 addition & 1 deletion lib/Index/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ add_swift_host_library(swiftIndex STATIC
IndexDataConsumer.cpp
IndexRecord.cpp
IndexSymbol.cpp
LINK_LIBRARIES
LINK_LIBS
swiftAST)
3 changes: 1 addition & 2 deletions lib/Markup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ add_swift_host_library(swiftMarkup STATIC
AST.cpp
LineList.cpp
Markup.cpp

LINK_LIBRARIES
LINK_LIBS
libcmark_static)
target_compile_definitions(swiftMarkup
PRIVATE
Expand Down
3 changes: 2 additions & 1 deletion lib/Migrator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ add_swift_host_library(swiftMigrator STATIC
Migrator.cpp
MigrationState.cpp
RewriteBufferEditsReceiver.cpp
LINK_LIBRARIES swiftSyntax swiftIDE)
LINK_LIBS
swiftSyntax swiftIDE)

add_dependencies(swiftMigrator
"symlink_migrator_data")
3 changes: 2 additions & 1 deletion lib/Option/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ add_swift_host_library(swiftOption STATIC
Options.cpp
SanitizerOptions.cpp
DEPENDS SwiftOptions
LINK_LIBRARIES swiftBasic)
LINK_LIBS
swiftBasic)

2 changes: 1 addition & 1 deletion lib/Parse/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ add_swift_host_library(swiftParse STATIC
Scope.cpp
SyntaxParsingCache.cpp
SyntaxParsingContext.cpp
LINK_LIBRARIES
LINK_LIBS
swiftAST
swiftSyntax
)
Expand Down
2 changes: 1 addition & 1 deletion lib/ParseSIL/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_swift_host_library(swiftParseSIL STATIC
ParseSIL.cpp
LINK_LIBRARIES
LINK_LIBS
swiftParse
swiftSema
swiftSIL
Expand Down
2 changes: 1 addition & 1 deletion lib/PrintAsObjC/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_swift_host_library(swiftPrintAsObjC STATIC
PrintAsObjC.cpp
LINK_LIBRARIES
LINK_LIBS
swiftIDE
swiftFrontend
swiftClangImporter
Expand Down
2 changes: 1 addition & 1 deletion lib/RemoteAST/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ add_swift_host_library(swiftRemoteAST STATIC
RemoteAST.cpp
InProcessMemoryReader.cpp
${REMOTE_LIB_HEADERS}
LINK_LIBRARIES
LINK_LIBS
swiftSema swiftIRGen)
2 changes: 1 addition & 1 deletion lib/SIL/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ add_swift_host_library(swiftSIL STATIC
SILWitnessTable.cpp
TypeLowering.cpp
ValueOwnership.cpp
LINK_LIBRARIES
LINK_LIBS
swiftSerialization
swiftSema
)
Expand Down
2 changes: 1 addition & 1 deletion lib/SILGen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ add_swift_host_library(swiftSILGen STATIC
SILGenStmt.cpp
SILGenThunk.cpp
SILGenType.cpp
LINK_LIBRARIES
LINK_LIBS
swiftSIL
)
3 changes: 2 additions & 1 deletion lib/SILOptimizer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@ add_subdirectory(Utils)

add_swift_host_library(swiftSILOptimizer STATIC
${SILOPTIMIZER_SOURCES}
LINK_LIBRARIES swiftSIL)
LINK_LIBS
swiftSIL)
2 changes: 1 addition & 1 deletion lib/Sema/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ add_swift_host_library(swiftSema STATIC
TypeCheckSwitchStmt.cpp
TypeCheckType.cpp
TypeChecker.cpp
LINK_LIBRARIES
LINK_LIBS
swiftParse
swiftAST
swiftSerialization
Expand Down
2 changes: 1 addition & 1 deletion lib/Serialization/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ add_swift_host_library(swiftSerialization STATIC
SerializedSILLoader.cpp
SerializeDoc.cpp
SerializeSIL.cpp
LINK_LIBRARIES
LINK_LIBS
swiftClangImporter)

2 changes: 1 addition & 1 deletion lib/SwiftDemangle/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ add_swift_host_library(swiftDemangle
SHARED
SwiftDemangle.cpp
MangleHack.cpp
LINK_LIBRARIES
LINK_LIBS
swiftDemangling)
target_compile_definitions(swiftDemangle
PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion lib/TBDGen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ add_subdirectory(tapi)
add_swift_host_library(swiftTBDGen STATIC
${TAPI_SOURCES}
TBDGen.cpp
LINK_LIBRARIES
LINK_LIBS
swiftAST
swiftSIL
)

0 comments on commit 39dde93

Please sign in to comment.