swiftlang · swift-ci · Feb 16, 2017 · Feb 16, 2017
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -459,9 +459,6 @@ endif()
 
 set(SWIFT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(SWIFT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-set(SWIFT_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
-set(SWIFT_MAIN_INCLUDE_DIR "${SWIFT_SOURCE_DIR}/include")
-set(SWIFT_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
 
 set(SWIFT_RUNTIME_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin")
 set(SWIFT_LIBRARY_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib")
@@ -482,8 +479,8 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # We'll need this once we have generated headers
 include_directories(BEFORE
-  ${SWIFT_MAIN_INCLUDE_DIR}
-  ${SWIFT_INCLUDE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
   )
 
 # A convenience pattern to match Darwin platforms. Example:
@@ -957,8 +954,6 @@ if(SWIFT_INCLUDE_DOCS)
   add_subdirectory(docs)
 endif()
 
-add_subdirectory(cmake/modules)
-
 swift_install_in_component(license
   FILES "LICENSE.txt"
   DESTINATION "share/swift")

diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
diff --git a/cmake/modules/SwiftConfig.cmake.in b/cmake/modules/SwiftConfig.cmake.in
diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
@@ -55,10 +55,11 @@ add_swift_library(swiftAST STATIC
   TypeRepr.cpp
   TypeWalker.cpp
   USRGeneration.cpp
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftMarkup
     swiftBasic
 
+  INTERFACE_LINK_LIBRARIES
     # Clang dependencies.
     # FIXME: Clang should really export these in some reasonable manner.
     clangCodeGen
@@ -80,7 +81,7 @@ add_swift_library(swiftAST STATIC
     clangAPINotes
     clangBasic
 
-  LINK_COMPONENTS
+  LLVM_COMPONENT_DEPENDS
     bitreader bitwriter coroutines coverage irreader debuginfoDWARF
     profiledata instrumentation object objcarcopts mc mcparser
     bitreader bitwriter lto ipo option core support ${LLVM_TARGETS_TO_BUILD}

diff --git a/lib/ASTSectionImporter/CMakeLists.txt b/lib/ASTSectionImporter/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_swift_library(swiftASTSectionImporter STATIC
   ASTSectionImporter.cpp
-  LINK_LIBS swiftBasic
-  LINK_COMPONENTS core)
+  LINK_LIBRARIES swiftBasic
+  LLVM_COMPONENT_DEPENDS core)
 
diff --git a/lib/Basic/CMakeLists.txt b/lib/Basic/CMakeLists.txt
@@ -1,10 +1,14 @@
 
 # On non-Darwin require UUID.
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  set(UUID_INCLUDE "")
+  set(UUID_LIBRARIES "")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(UUID_INCLUDE "")
   set(UUID_LIBRARIES "ole32.lib")
-elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+else()
   find_package(UUID REQUIRED)
-  include_directories(AFTER ${UUID_INCLUDE_DIRS})
+  set(UUID_INCLUDE "-I${UUID_INCLUDE_DIRS}")
 endif()
 
 # Figure out if we can track VC revisions.
@@ -60,13 +64,6 @@ generate_revision_inc(swift_revision_inc Swift "${SWIFT_SOURCE_DIR}")
 set(version_inc_files
   ${llvm_revision_inc} ${clang_revision_inc} ${swift_revision_inc})
 
-set(generated_include_sources UnicodeExtendedGraphemeClusters.cpp.gyb)
-
-handle_gyb_sources(
-    generated_include_targets
-    generated_include_sources
-    "")
-
 add_swift_library(swiftBasic STATIC
   Cache.cpp
   ClusteredBitVector.cpp
@@ -109,11 +106,11 @@ add_swift_library(swiftBasic STATIC
   # Platform-agnostic fallback TaskQueue implementation
   Default/TaskQueue.inc
 
-  ${generated_include_sources}
+  UnicodeExtendedGraphemeClusters.cpp.gyb
 
-  LINK_LIBS ${UUID_LIBRARIES}
-  LINK_COMPONENTS support
-  DEPENDS ${generated_include_targets})
+  C_COMPILE_FLAGS ${UUID_INCLUDE}
+  LINK_LIBRARIES ${UUID_LIBRARIES}
+  LLVM_COMPONENT_DEPENDS support)
 
 message(STATUS "Swift version: ${SWIFT_VERSION}")
 message(STATUS "Swift vendor: ${SWIFT_VENDOR}")

diff --git a/lib/ClangImporter/CMakeLists.txt b/lib/ClangImporter/CMakeLists.txt
@@ -20,7 +20,7 @@ add_swift_library(swiftClangImporter STATIC
   ImportName.cpp
   ImportType.cpp
   SwiftLookupTable.cpp
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftAST
     swiftParse
 )

diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt
@@ -17,7 +17,7 @@ set(swiftDriver_targetDefines)
 add_swift_library(swiftDriver STATIC
   ${swiftDriver_sources}
   DEPENDS SwiftOptions
-  LINK_LIBS swiftAST swiftBasic swiftFrontend swiftOption)
+  LINK_LIBRARIES swiftAST swiftBasic swiftFrontend 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
@@ -13,7 +13,7 @@ add_swift_library(swiftFrontend STATIC
   SerializedDiagnosticConsumer.cpp
   ${AppleHostVersionDetection}
   DEPENDS SwiftOptions
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftSIL
     swiftOption
     swiftParse

diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt
@@ -2,7 +2,7 @@ add_swift_library(swiftFrontendTool STATIC
   FrontendTool.cpp
   ReferenceDependencies.cpp
   DEPENDS SwiftOptions
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftIDE
     swiftIRGen swiftSIL swiftSILGen swiftSILOptimizer
     swiftImmediate

diff --git a/lib/IDE/CMakeLists.txt b/lib/IDE/CMakeLists.txt
@@ -9,7 +9,7 @@ add_swift_library(swiftIDE STATIC
   SwiftSourceDocInfo.cpp
   SyntaxModel.cpp
   Utils.cpp
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftFrontend
     swiftClangImporter
     swiftParse

diff --git a/lib/IRGen/CMakeLists.txt b/lib/IRGen/CMakeLists.txt
@@ -41,7 +41,7 @@ add_swift_library(swiftIRGen STATIC
   StructLayout.cpp
   SwiftTargetInfo.cpp
   TypeLayoutVerifier.cpp
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftAST
     swiftLLVMPasses
     swiftSIL

diff --git a/lib/Immediate/CMakeLists.txt b/lib/Immediate/CMakeLists.txt
@@ -1,12 +1,12 @@
 add_swift_library(swiftImmediate STATIC
   Immediate.cpp
   REPL.cpp
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftIDE
     swiftFrontend
     swiftSILGen
     swiftSILOptimizer
     swiftIRGen
-  LINK_COMPONENTS
+  LLVM_COMPONENT_DEPENDS
     linker mcjit)
 
diff --git a/lib/Index/CMakeLists.txt b/lib/Index/CMakeLists.txt
@@ -2,5 +2,5 @@ add_swift_library(swiftIndex STATIC
   Index.cpp
   IndexDataConsumer.cpp
   IndexSymbol.cpp
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftAST)
diff --git a/lib/LLVMPasses/CMakeLists.txt b/lib/LLVMPasses/CMakeLists.txt
@@ -6,7 +6,7 @@ add_swift_library(swiftLLVMPasses STATIC
   LLVMInlineTree.cpp
   LLVMMergeFunctions.cpp
 
-  LINK_COMPONENTS
+  LLVM_COMPONENT_DEPENDS
   analysis
   )
 
diff --git a/lib/Markup/CMakeLists.txt b/lib/Markup/CMakeLists.txt
@@ -3,6 +3,6 @@ add_swift_library(swiftMarkup STATIC
   LineList.cpp
   Markup.cpp
 
-  LINK_LIBS
+  LINK_LIBRARIES
     libcmark_static)
 
diff --git a/lib/Option/CMakeLists.txt b/lib/Option/CMakeLists.txt
@@ -2,5 +2,6 @@ add_swift_library(swiftOption STATIC
   Options.cpp
   SanitizerOptions.cpp
   DEPENDS SwiftOptions
-  LINK_LIBS swiftBasic)
+  LINK_LIBRARIES swiftBasic
+  FILE_DEPENDS SwiftOptions)
 
diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt
@@ -10,7 +10,7 @@ add_swift_library(swiftParse STATIC
   ParseType.cpp
   PersistentParserState.cpp
   Scope.cpp
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftSIL
     swiftAST
 )

diff --git a/lib/PrintAsObjC/CMakeLists.txt b/lib/PrintAsObjC/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_swift_library(swiftPrintAsObjC STATIC
   PrintAsObjC.cpp
 
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftIDE
     swiftFrontend
     swiftClangImporter

diff --git a/lib/RemoteAST/CMakeLists.txt b/lib/RemoteAST/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_swift_library(swiftRemoteAST STATIC
   RemoteAST.cpp
   InProcessMemoryReader.cpp
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftSema swiftIRGen)
diff --git a/lib/SIL/CMakeLists.txt b/lib/SIL/CMakeLists.txt
@@ -33,7 +33,7 @@ add_swift_library(swiftSIL STATIC
   SILVTable.cpp
   SILWitnessTable.cpp
   TypeLowering.cpp
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftSerialization
     swiftSema
 )

diff --git a/lib/SILGen/CMakeLists.txt b/lib/SILGen/CMakeLists.txt
@@ -28,6 +28,6 @@ add_swift_library(swiftSILGen STATIC
   SILGenProlog.cpp
   SILGenStmt.cpp
   SILGenType.cpp
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftSIL
 )
diff --git a/lib/SILOptimizer/CMakeLists.txt b/lib/SILOptimizer/CMakeLists.txt
@@ -19,4 +19,4 @@ add_swift_library(swiftSILOptimizer STATIC
   ${MANDATORY_SOURCES}
   ${TRANSFORMS_SOURCES}
   ${IPO_SOURCES}
-  LINK_LIBS swiftSIL)
+  LINK_LIBRARIES swiftSIL)
diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt
@@ -47,7 +47,7 @@ add_swift_library(swiftSema STATIC
   TypeCheckStmt.cpp
   TypeCheckType.cpp
   TypeChecker.cpp
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftParse
     swiftAST
   ${EXTRA_TYPECHECKER_FLAGS}

diff --git a/lib/Serialization/CMakeLists.txt b/lib/Serialization/CMakeLists.txt
@@ -6,6 +6,6 @@ add_swift_library(swiftSerialization STATIC
   SerializedModuleLoader.cpp
   SerializedSILLoader.cpp
   SerializeSIL.cpp
-  LINK_LIBS
+  LINK_LIBRARIES
     swiftClangImporter)
 
diff --git a/lib/SwiftDemangle/CMakeLists.txt b/lib/SwiftDemangle/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_swift_library(swiftDemangle SHARED
   SwiftDemangle.cpp
   MangleHack.cpp
-  LINK_LIBS swiftBasic)
+  LINK_LIBRARIES swiftBasic)
 
 swift_install_in_component(compiler
     TARGETS swiftDemangle

diff --git a/stdlib/internal/SwiftExperimental/CMakeLists.txt b/stdlib/internal/SwiftExperimental/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_target_library(swiftSwiftExperimental ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+add_swift_library(swiftSwiftExperimental ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   SwiftExperimental.swift

diff --git a/stdlib/private/StdlibCollectionUnittest/CMakeLists.txt b/stdlib/private/StdlibCollectionUnittest/CMakeLists.txt
@@ -5,7 +5,7 @@ endif()
 
 # TODO: support this on non-POSIX platforms.  It cannot be currently as it
 # depends on pthreads.
-add_swift_target_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+add_swift_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   StdlibCollectionUnittest.swift

diff --git a/stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt b/stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt
@@ -5,7 +5,7 @@ endif()
 
 # TODO: support this on non-POSIX platforms.  It cannot be currently as it
 # depends on pthreads.
-add_swift_target_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+add_swift_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   StdlibUnicodeUnittest.swift

diff --git a/stdlib/private/StdlibUnittest/CMakeLists.txt b/stdlib/private/StdlibUnittest/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
 
 # TODO: support this on non-POSIX platforms.  It cannot be currently as it
 # depends on pthreads.
-add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+add_swift_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   StdlibUnittest.swift.gyb

diff --git a/stdlib/private/StdlibUnittestFoundationExtras/CMakeLists.txt b/stdlib/private/StdlibUnittestFoundationExtras/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_target_library(swiftStdlibUnittestFoundationExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+add_swift_library(swiftStdlibUnittestFoundationExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   StdlibUnittestFoundationExtras.swift

diff --git a/stdlib/private/SwiftPrivate/CMakeLists.txt b/stdlib/private/SwiftPrivate/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+add_swift_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   SwiftPrivate.swift

diff --git a/stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt b/stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_target_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+add_swift_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   SwiftPrivateLibcExtras.swift

diff --git a/stdlib/private/SwiftPrivatePthreadExtras/CMakeLists.txt b/stdlib/private/SwiftPrivatePthreadExtras/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_target_library(swiftSwiftPrivatePthreadExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+add_swift_library(swiftSwiftPrivatePthreadExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   SwiftPrivatePthreadExtras.swift

diff --git a/stdlib/private/SwiftReflectionTest/CMakeLists.txt b/stdlib/private/SwiftReflectionTest/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 if (SWIFT_INCLUDE_TESTS)
-  add_swift_target_library(swiftSwiftReflectionTest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+  add_swift_library(swiftSwiftReflectionTest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
     SwiftReflectionTest.swift
     SWIFT_MODULE_DEPENDS Darwin
     TARGET_SDKS ALL_APPLE_PLATFORMS