---

yaml
---
r: 347467
b: refs/heads/master
c: 06a1281
h: refs/heads/master
i:
  347465: d7831e7
  347463: c50c2b9

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a23a1eaec9eb6c0b8b4da698f7116b03c4576e79
+refs/heads/master: 06a1281bb85a800c20317aafaeb2a0b6f2f08076
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/cmake/modules/AddSwift.cmake

@@ -1376,15 +1376,8 @@ endfunction()
 #   add_swift_host_library(name
 #     [SHARED]
 #     [STATIC]
-#     [DEPENDS dep1 ...]
-#     [INTERFACE_LINK_LIBRARIES dep1 ...]
-#     [SWIFT_MODULE_DEPENDS dep1 ...]
 #     [LLVM_COMPONENT_DEPENDS comp1 ...]
 #     [FILE_DEPENDS target1 ...]
-#     [C_COMPILE_FLAGS flag1...]
-#     [LINK_FLAGS flag1...]
-#     [INSTALL]
-#     INSTALL_IN_COMPONENT comp
 #     source1 [source2 source3 ...])
 #
 # name
@@ -1396,24 +1389,12 @@ endfunction()
 # STATIC
 #   Build a static library.
 #
-# DEPENDS
-#   Targets that this library depends on.
-#
 # LLVM_COMPONENT_DEPENDS
 #   LLVM components this library depends on.
 #
 # FILE_DEPENDS
 #   Additional files this library depends on.
 #
-# C_COMPILE_FLAGS
-#   Extra compiler flags (C, C++, ObjC).
-#
-# LINK_FLAGS
-#   Extra linker flags.
-#
-# INSTALL_IN_COMPONENT comp
-#   The Swift installation component that this library belongs to.
-#
 # source1 ...
 #   Sources to add into this library.
 function(add_swift_host_library name)
@@ -1427,7 +1408,6 @@ function(add_swift_host_library name)
         DEPENDS
         FILE_DEPENDS
         INTERFACE_LINK_LIBRARIES
-        LINK_FLAGS
         LINK_LIBRARIES
         LLVM_COMPONENT_DEPENDS)
 
@@ -1438,6 +1418,15 @@ function(add_swift_host_library name)
                         ${ARGN})
   set(ASHL_SOURCES ${ASHL_UNPARSED_ARGUMENTS})
 
+  if(ASHL_C_COMPILE_FLAGS)
+    message(SEND_ERROR "library ${name} is using C_COMPILE_FLAGS parameter which is deprecated.  Please use target_compile_definitions, target_compile_options, or target_include_directories instead")
+  endif()
+  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()
@@ -1457,12 +1446,8 @@ function(add_swift_host_library name)
     ${ASHL_FORCE_BUILD_OPTIMIZED_keyword}
     SDK ${SWIFT_HOST_VARIANT_SDK}
     ARCHITECTURE ${SWIFT_HOST_VARIANT_ARCH}
-    DEPENDS ${ASHL_DEPENDS}
     LLVM_COMPONENT_DEPENDS ${ASHL_LLVM_COMPONENT_DEPENDS}
     FILE_DEPENDS ${ASHL_FILE_DEPENDS}
-    C_COMPILE_FLAGS ${ASHL_C_COMPILE_FLAGS}
-    LINK_FLAGS ${ASHL_LINK_FLAGS}
-    INTERFACE_LINK_LIBRARIES ${ASHL_INTERFACE_LINK_LIBRARIES}
     INSTALL_IN_COMPONENT "dev"
     )
 

trunk/lib/AST/CMakeLists.txt

@@ -4,31 +4,8 @@ if (SWIFT_FORCE_OPTIMIZED_TYPECHECKER)
 endif()
 
 if(SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
-  set(SWIFTAST_INTERFACE_LINK_LIBRARIES)
   set(SWIFTAST_LLVM_COMPONENT_DEPENDS)
 else()
-  set(SWIFTAST_INTERFACE_LINK_LIBRARIES
-    # Clang dependencies.
-    # FIXME: Clang should really export these in some reasonable manner.
-    clangCodeGen
-    clangIndex
-    clangFormat
-    clangToolingCore
-    clangFrontendTool
-    clangFrontend
-    clangDriver
-    clangSerialization
-    clangParse
-    clangSema
-    clangAnalysis
-    clangEdit
-    clangRewriteFrontend
-    clangRewrite
-    clangAST
-    clangLex
-    clangAPINotes
-    clangBasic
-  )
   set(SWIFTAST_LLVM_COMPONENT_DEPENDS
     bitreader bitwriter coroutines coverage irreader debuginfoDWARF
     profiledata instrumentation object objcarcopts mc mcparser
@@ -98,14 +75,32 @@ add_swift_host_library(swiftAST STATIC
   UnqualifiedLookup.cpp
   USRGeneration.cpp
 
-  INTERFACE_LINK_LIBRARIES
-    ${SWIFTAST_INTERFACE_LINK_LIBRARIES}
-
   LLVM_COMPONENT_DEPENDS
     ${SWIFTAST_LLVM_COMPONENT_DEPENDS}
 
   ${EXTRA_AST_FLAGS}
   )
+if(NOT SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
+  target_link_libraries(swiftAST INTERFACE
+    clangCodeGen
+    clangIndex
+    clangFormat
+    clangToolingCore
+    clangFrontendTool
+    clangFrontend
+    clangDriver
+    clangSerialization
+    clangParse
+    clangSema
+    clangAnalysis
+    clangEdit
+    clangRewriteFrontend
+    clangRewrite
+    clangAST
+    clangLex
+    clangAPINotes
+    clangBasic)
+endif()
 
 if(SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
   # Add clangBasic as a single direct dependency to avoid bringing along some

trunk/lib/Basic/CMakeLists.txt

@@ -105,8 +105,9 @@ add_swift_host_library(swiftBasic STATIC
   GYB_SOURCES
     UnicodeExtendedGraphemeClusters.cpp.gyb
 
-  C_COMPILE_FLAGS ${UUID_INCLUDE}
   LLVM_COMPONENT_DEPENDS support)
+target_include_directories(swiftBasic PRIVATE
+  ${UUID_INCLUDE})
 
 if(NOT SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
   target_link_libraries(swiftBasic PRIVATE

trunk/lib/Demangling/CMakeLists.txt

@@ -1,14 +1,13 @@
-add_swift_host_library(swiftDemangling
-                  STATIC
-                    Demangler.cpp
-                    Context.cpp
-                    ManglingUtils.cpp
-                    NodeDumper.cpp
-                    NodePrinter.cpp
-                    OldDemangler.cpp
-                    OldRemangler.cpp
-                    Punycode.cpp
-                    Remangler.cpp
-                  C_COMPILE_FLAGS
-                    -DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1)
+add_swift_host_library(swiftDemangling STATIC
+  Demangler.cpp
+  Context.cpp
+  ManglingUtils.cpp
+  NodeDumper.cpp
+  NodePrinter.cpp
+  OldDemangler.cpp
+  OldRemangler.cpp
+  Punycode.cpp
+  Remangler.cpp)
+target_compile_definitions(swiftDemangling PRIVATE
+  LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1)
 

trunk/lib/Driver/CMakeLists.txt

@@ -18,8 +18,9 @@ set(swiftDriver_sources
 set(swiftDriver_targetDefines)
 
 add_swift_host_library(swiftDriver STATIC
-  ${swiftDriver_sources}
-  DEPENDS SwiftOptions)
+  ${swiftDriver_sources})
+add_dependencies(swiftDriver
+  SwiftOptions)
 target_link_libraries(swiftDriver PRIVATE
   swiftAST
   swiftBasic

trunk/lib/Frontend/CMakeLists.txt

@@ -10,9 +10,9 @@ add_swift_host_library(swiftFrontend STATIC
   ParseableInterfaceModuleLoader.cpp
   ParseableInterfaceSupport.cpp
   PrintingDiagnosticConsumer.cpp
-  SerializedDiagnosticConsumer.cpp
-  DEPENDS
-    SwiftOptions)
+  SerializedDiagnosticConsumer.cpp)
+add_dependencies(swiftFrontend
+  SwiftOptions)
 target_link_libraries(swiftFrontend PRIVATE
   swiftSIL
   swiftMigrator

trunk/lib/FrontendTool/CMakeLists.txt

@@ -2,13 +2,13 @@ add_swift_host_library(swiftFrontendTool STATIC
   FrontendTool.cpp
   ImportedModules.cpp
   ReferenceDependencies.cpp
-  TBD.cpp
-  DEPENDS
-    swift-syntax-generated-headers SwiftOptions
-  INTERFACE_LINK_LIBRARIES
-    clangAPINotes
-    clangBasic
-)
+  TBD.cpp)
+add_dependencies(swiftFrontendTool
+  swift-syntax-generated-headers
+  SwiftOptions)
+target_link_libraries(swiftFrontendTool INTERFACE
+  clangAPINotes
+  clangBasic)
 target_link_libraries(swiftFrontendTool PRIVATE
     swiftClangImporter
     swiftDemangling

trunk/lib/IRGen/CMakeLists.txt

@@ -51,16 +51,13 @@ add_swift_host_library(swiftIRGen STATIC
   TypeLayoutDumper.cpp
   TypeLayoutVerifier.cpp
 
-  INTERFACE_LINK_LIBRARIES
-    # Clang dependencies.
-    # FIXME: Clang should really export these in some reasonable manner.
-    clangCodeGen
-    clangAST
-
   LLVM_COMPONENT_DEPENDS
     target
     transformutils
 )
+target_link_libraries(swiftIRGen INTERFACE
+  clangCodeGen
+  clangAST)
 target_link_libraries(swiftIRGen PRIVATE
   swiftAST
   swiftLLVMPasses

trunk/lib/Option/CMakeLists.txt

@@ -1,8 +1,9 @@
 add_swift_host_library(swiftOption STATIC
   Options.cpp
   SanitizerOptions.cpp
-  DEPENDS SwiftOptions
   FILE_DEPENDS SwiftOptions)
+add_dependencies(swiftOption
+  SwiftOptions)
 target_link_libraries(swiftOption PRIVATE
   swiftBasic)
 

trunk/lib/SwiftDemangle/CMakeLists.txt

@@ -1,9 +1,8 @@
-add_swift_host_library(swiftDemangle
-                  SHARED
-                    SwiftDemangle.cpp
-                    MangleHack.cpp
-                  C_COMPILE_FLAGS
-                    -DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1)
+add_swift_host_library(swiftDemangle SHARED
+  SwiftDemangle.cpp
+  MangleHack.cpp)
+target_compile_definitions(swiftDemangle PRIVATE
+  LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1)
 target_link_libraries(swiftDemangle PRIVATE
   swiftDemangling)