add_swift_host_library: rename LINK_LIBRARIES to LINK_LIBS

compnerd · compnerd · commit 39dde93c887f · 2018-10-31T12:46:31.000-07:00
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
@@ -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 ...]
@@ -1343,7 +1343,7 @@ endfunction()
 # DEPENDS
 #   Targets that this library depends on.
 #
-# LINK_LIBRARIES
+# LINK_LIBS
 #   Libraries this library depends on.
 #
 # LLVM_COMPONENT_DEPENDS
@@ -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
@@ -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}
diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
@@ -62,7 +62,7 @@ add_swift_host_library(swiftAST STATIC
   TypeWalker.cpp
   USRGeneration.cpp
 
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftMarkup
     swiftBasic
     swiftSyntax
diff --git a/lib/ASTSectionImporter/CMakeLists.txt b/lib/ASTSectionImporter/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_swift_host_library(swiftASTSectionImporter STATIC
   ASTSectionImporter.cpp
-  LINK_LIBRARIES swiftBasic
+  LINK_LIBS swiftBasic
   LLVM_COMPONENT_DEPENDS core)
 
diff --git a/lib/Basic/CMakeLists.txt b/lib/Basic/CMakeLists.txt
@@ -101,7 +101,7 @@ add_swift_host_library(swiftBasic STATIC
 
   UnicodeExtendedGraphemeClusters.cpp.gyb
 
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftDemangling
     ${UUID_LIBRARIES}
   LLVM_COMPONENT_DEPENDS support)
diff --git a/lib/ClangImporter/CMakeLists.txt b/lib/ClangImporter/CMakeLists.txt
@@ -16,7 +16,7 @@ add_swift_host_library(swiftClangImporter STATIC
   ImportName.cpp
   ImportType.cpp
   SwiftLookupTable.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftAST
     swiftParse
 )
diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt
@@ -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)
diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
@@ -12,7 +12,7 @@ add_swift_host_library(swiftFrontend STATIC
   SerializedDiagnosticConsumer.cpp
   DEPENDS
     SwiftOptions
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftSIL
     swiftMigrator
     swiftOption
diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt
@@ -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
diff --git a/lib/IDE/CMakeLists.txt b/lib/IDE/CMakeLists.txt
@@ -13,7 +13,7 @@ add_swift_host_library(swiftIDE STATIC
   IDETypeChecking.cpp
   APIDigesterData.cpp
   SourceEntityWalker.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftFrontend
     swiftClangImporter
     swiftParse
diff --git a/lib/IRGen/CMakeLists.txt b/lib/IRGen/CMakeLists.txt
@@ -49,7 +49,7 @@ add_swift_host_library(swiftIRGen STATIC
   SwiftTargetInfo.cpp
   TypeLayoutDumper.cpp
   TypeLayoutVerifier.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftAST
     swiftLLVMPasses
     swiftSIL
diff --git a/lib/Immediate/CMakeLists.txt b/lib/Immediate/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_swift_host_library(swiftImmediate STATIC
   Immediate.cpp
   REPL.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftIDE
     swiftFrontend
     swiftSILGen
diff --git a/lib/Index/CMakeLists.txt b/lib/Index/CMakeLists.txt
@@ -3,5 +3,5 @@ add_swift_host_library(swiftIndex STATIC
   IndexDataConsumer.cpp
   IndexRecord.cpp
   IndexSymbol.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftAST)
diff --git a/lib/Markup/CMakeLists.txt b/lib/Markup/CMakeLists.txt
@@ -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
diff --git a/lib/Migrator/CMakeLists.txt b/lib/Migrator/CMakeLists.txt
@@ -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")
diff --git a/lib/Option/CMakeLists.txt b/lib/Option/CMakeLists.txt
@@ -2,5 +2,6 @@ add_swift_host_library(swiftOption STATIC
   Options.cpp
   SanitizerOptions.cpp
   DEPENDS SwiftOptions
-  LINK_LIBRARIES swiftBasic)
+  LINK_LIBS
+    swiftBasic)
 
diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt
@@ -13,7 +13,7 @@ add_swift_host_library(swiftParse STATIC
   Scope.cpp
   SyntaxParsingCache.cpp
   SyntaxParsingContext.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftAST
     swiftSyntax
 )
diff --git a/lib/ParseSIL/CMakeLists.txt b/lib/ParseSIL/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_swift_host_library(swiftParseSIL STATIC
   ParseSIL.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftParse
     swiftSema
     swiftSIL
diff --git a/lib/PrintAsObjC/CMakeLists.txt b/lib/PrintAsObjC/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_swift_host_library(swiftPrintAsObjC STATIC
   PrintAsObjC.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftIDE
     swiftFrontend
     swiftClangImporter
diff --git a/lib/RemoteAST/CMakeLists.txt b/lib/RemoteAST/CMakeLists.txt
@@ -15,5 +15,5 @@ add_swift_host_library(swiftRemoteAST STATIC
   RemoteAST.cpp
   InProcessMemoryReader.cpp
   ${REMOTE_LIB_HEADERS}
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftSema swiftIRGen)
diff --git a/lib/SIL/CMakeLists.txt b/lib/SIL/CMakeLists.txt
@@ -44,7 +44,7 @@ add_swift_host_library(swiftSIL STATIC
   SILWitnessTable.cpp
   TypeLowering.cpp
   ValueOwnership.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftSerialization
     swiftSema
 )
diff --git a/lib/SILGen/CMakeLists.txt b/lib/SILGen/CMakeLists.txt
@@ -30,6 +30,6 @@ add_swift_host_library(swiftSILGen STATIC
   SILGenStmt.cpp
   SILGenThunk.cpp
   SILGenType.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftSIL
 )
diff --git a/lib/SILOptimizer/CMakeLists.txt b/lib/SILOptimizer/CMakeLists.txt
@@ -35,4 +35,5 @@ add_subdirectory(Utils)
 
 add_swift_host_library(swiftSILOptimizer STATIC
   ${SILOPTIMIZER_SOURCES}
-  LINK_LIBRARIES swiftSIL)
+  LINK_LIBS
+    swiftSIL)
diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt
@@ -58,7 +58,7 @@ add_swift_host_library(swiftSema STATIC
   TypeCheckSwitchStmt.cpp
   TypeCheckType.cpp
   TypeChecker.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftParse
     swiftAST
     swiftSerialization
diff --git a/lib/Serialization/CMakeLists.txt b/lib/Serialization/CMakeLists.txt
@@ -7,6 +7,6 @@ add_swift_host_library(swiftSerialization STATIC
   SerializedSILLoader.cpp
   SerializeDoc.cpp
   SerializeSIL.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftClangImporter)
 
diff --git a/lib/SwiftDemangle/CMakeLists.txt b/lib/SwiftDemangle/CMakeLists.txt
@@ -2,7 +2,7 @@ add_swift_host_library(swiftDemangle
                   SHARED
                     SwiftDemangle.cpp
                     MangleHack.cpp
-                  LINK_LIBRARIES
+                  LINK_LIBS
                     swiftDemangling)
 target_compile_definitions(swiftDemangle
                            PRIVATE
diff --git a/lib/TBDGen/CMakeLists.txt b/lib/TBDGen/CMakeLists.txt
@@ -3,7 +3,7 @@ add_subdirectory(tapi)
 add_swift_host_library(swiftTBDGen STATIC
   ${TAPI_SOURCES}
   TBDGen.cpp
-  LINK_LIBRARIES
+  LINK_LIBS
     swiftAST
     swiftSIL
 )

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ add_swift_host_library(swiftClangImporter STATIC`
`16`	`16`	`ImportName.cpp`
`17`	`17`	`ImportType.cpp`
`18`	`18`	`SwiftLookupTable.cpp`
`19`		`- LINK_LIBRARIES`
	`19`	`+ LINK_LIBS`
`20`	`20`	`swiftAST`
`21`	`21`	`swiftParse`
`22`	`22`	`)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ add_swift_host_library(swiftParse STATIC`
`13`	`13`	`Scope.cpp`
`14`	`14`	`SyntaxParsingCache.cpp`
`15`	`15`	`SyntaxParsingContext.cpp`
`16`		`- LINK_LIBRARIES`
	`16`	`+ LINK_LIBS`
`17`	`17`	`swiftAST`
`18`	`18`	`swiftSyntax`
`19`	`19`	`)`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ add_swift_host_library(swiftSIL STATIC`
`44`	`44`	`SILWitnessTable.cpp`
`45`	`45`	`TypeLowering.cpp`
`46`	`46`	`ValueOwnership.cpp`
`47`		`- LINK_LIBRARIES`
	`47`	`+ LINK_LIBS`
`48`	`48`	`swiftSerialization`
`49`	`49`	`swiftSema`
`50`	`50`	`)`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ add_swift_host_library(swiftSILGen STATIC`
`30`	`30`	`SILGenStmt.cpp`
`31`	`31`	`SILGenThunk.cpp`
`32`	`32`	`SILGenType.cpp`
`33`		`- LINK_LIBRARIES`
	`33`	`+ LINK_LIBS`
`34`	`34`	`swiftSIL`
`35`	`35`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ add_subdirectory(tapi)`
`3`	`3`	`add_swift_host_library(swiftTBDGen STATIC`
`4`	`4`	`${TAPI_SOURCES}`
`5`	`5`	`TBDGen.cpp`
`6`		`- LINK_LIBRARIES`
	`6`	`+ LINK_LIBS`
`7`	`7`	`swiftAST`
`8`	`8`	`swiftSIL`
`9`	`9`	`)`