Skip to content

Commit c97f302

Browse files
DougGregorDougGregor
authored
Merge pull request #85 from DougGregor/cmake-build-system
Add support for building with CMake
2 parents d7e6f7d + 9ec5699 commit c97f302

File tree

9 files changed

+258
-2
lines changed

9 files changed

+258
-2
lines changed

‎CMakeLists.txt

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# This source file is part of the Swift.org open source project
2+
#
3+
# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
4+
# Licensed under Apache License v2.0 with Runtime Library Exception
5+
#
6+
# See http://swift.org/LICENSE.txt for license information
7+
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
8+
9+
cmake_minimum_required(VERSION 3.15.1)
10+
11+
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
12+
13+
project(SwiftDriver LANGUAGES Swift)
14+
15+
set(SWIFT_VERSION 5)
16+
set(CMAKE_Swift_LANGUAGE_VERSION ${SWIFT_VERSION})
17+
if(CMAKE_VERSION VERSION_LESS 3.16)
18+
add_compile_options($<$<COMPILE_LANGUAGE:Swift>:-swift-version$<SEMICOLON>${SWIFT_VERSION}>)
19+
set(CMAKE_LINK_LIBRARY_FLAG "-l")
20+
endif()
21+
22+
set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
23+
24+
if(CMAKE_VERSION VERSION_LESS 3.16 AND CMAKE_SYSTEM_NAME STREQUAL Windows)
25+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
26+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
27+
else()
28+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
29+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
30+
endif()
31+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
32+
33+
option(BUILD_SHARED_LIBS "Build shared libraryes by default" YES)
34+
35+
find_package(TSC CONFIG REQUIRED)
36+
37+
find_package(LLBuild CONFIG)
38+
if(NOT LLBuild_FOUND)
39+
find_package(LLBuild REQUIRED)
40+
endif()
41+
42+
find_package(dispatch QUIET)
43+
find_package(Foundation QUIET)
44+
find_package(Yams CONFIG REQUIRED)
45+
46+
add_subdirectory(Sources)

‎Package.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"repositoryURL": "https://github.com/jpsim/Yams.git",
2525
"state": {
2626
"branch": "master",
27-
"revision": "fbc979b7feb4c32e2aa1087f958d826d3cf8472f",
27+
"revision": "b2537bc463f5622e1d30be81fe4e4ef841d1a718",
2828
"version": null
2929
}
3030
}

‎README.md

+21-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The `swift-driver` project is a new implementation of the Swift compiler driver
1111

1212
## Getting Started
1313

14-
Use the Swift package manager to build `swift-driver`:
14+
The preferred way to build `swift-driver` is to use the Swift package manager:
1515

1616
```
1717
$ swift build
@@ -32,6 +32,26 @@ SWIFT_EXEC=$SOME_PATH/swiftc swift build
3232

3333
Similarly, one can use the new Swift driver within Xcode by adding a custom build setting (usually at the project level) named `SWIFT_EXEC` that refers to `$SOME_PATH/swiftc`.
3434

35+
## Building with CMake
36+
37+
`swift-driver` can also be built with CMake, which is suggested for
38+
environments where the Swift Package Manager is not yet
39+
available. Doing so requires several dependencies to be built first,
40+
all with CMake:
41+
42+
* (Non-Apple platforms only) [swift-corelibs-foundation](https://github.com/apple/swift-corelibs-foundation)
43+
* [llbuild](https://github.com/apple/swift-llbuild) configure CMake with `-DLLBUILD_SUPPORT_BINDINGS="Swift"` when building
44+
```
45+
cmake -B <llbuild-build-dir> -G Ninja <llbuild-source-dir> -DLLBUILD_SUPPORT_BINDINGS="Swift"
46+
```
47+
* [Yams](https://github.com/jpsim/Yams)
48+
49+
Once those dependencies have built, build `swift-driver` itself:
50+
```
51+
cmake -B <swift-driver-build-dir> -G Ninja <swift-driver-source-dir> -DTSC_DIR=<swift-tools-support-core-build-dir>/cmake/modules -DLLBuild_DIR=<llbuild-build-dir>/cmake/modules -DYams_DIR=<yamls-build-dir>/cmake/modules
52+
cmake --build <swift-driver-build-dir>
53+
```
54+
3555
## Developing `swift-driver`
3656

3757
The new Swift driver is a work in progress, and there are numerous places for anyone with an interest to contribute! This section covers testing, miscellaneous development tips and tricks, and a rough development plan showing what work still needs to be done.

‎Sources/CMakeLists.txt

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This source file is part of the Swift.org open source project
2+
#
3+
# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
4+
# Licensed under Apache License v2.0 with Runtime Library Exception
5+
#
6+
# See http://swift.org/LICENSE.txt for license information
7+
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
8+
9+
add_subdirectory(SwiftOptions)
10+
add_subdirectory(SwiftDriver)
11+
add_subdirectory(swift-driver)
12+
add_subdirectory(swift-help)

‎Sources/SwiftDriver/CMakeLists.txt

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# This source file is part of the Swift.org open source project
2+
#
3+
# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
4+
# Licensed under Apache License v2.0 with Runtime Library Exception
5+
#
6+
# See http://swift.org/LICENSE.txt for license information
7+
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
8+
9+
add_library(SwiftDriver
10+
Driver/CompilerMode.swift
11+
Driver/DebugInfo.swift
12+
Driver/Driver.swift
13+
Driver/LinkKind.swift
14+
Driver/OutputFileMap.swift
15+
Driver/ToolExecutionDelegate.swift
16+
17+
Execution/JobExecutor.swift
18+
Execution/ParsableOutput.swift
19+
Execution/ProcessProtocol.swift
20+
Execution/llbuild.swift
21+
22+
"Incremental Compilation/IncrementalCompilation.swift"
23+
"Incremental Compilation/InputIInfoMap.swift"
24+
"Incremental Compilation/InputInfo.swift"
25+
26+
Jobs/AutolinkExtractJob.swift
27+
Jobs/CommandLineArguments.swift
28+
Jobs/CompileJob.swift
29+
Jobs/DarwinToolchain+LinkerSupport.swift
30+
Jobs/EmitModuleJob.swift
31+
Jobs/FrontendJobHelpers.swift
32+
Jobs/GenerateDSYMJob.swift
33+
Jobs/GeneratePCHJob.swift
34+
Jobs/GeneratePCMJob.swift
35+
Jobs/GenericUnixToolchain+LinkerSupport.swift
36+
Jobs/InterpretJob.swift
37+
Jobs/Job.swift
38+
Jobs/LinkJob.swift
39+
Jobs/MergeModuleJob.swift
40+
Jobs/Planning.swift
41+
Jobs/ReplJob.swift
42+
Jobs/Toolchain+InterpreterSupport.swift
43+
Jobs/Toolchain+LinkerSupport.swift
44+
Jobs/VerifyDebugInfoJob.swift
45+
46+
Toolchains/DarwinToolchain.swift
47+
Toolchains/GenericUnixToolchain.swift
48+
Toolchains/Toolchain.swift
49+
50+
Utilities/DOTJobGraphSerializer.swift
51+
Utilities/DateAdditions.swift
52+
Utilities/Diagnostics.swift
53+
Utilities/FileType.swift
54+
Utilities/PredictableRandomNumberGenerator.swift
55+
Utilities/RelativePathAdditions.swift
56+
Utilities/Sanitizer.swift
57+
Utilities/StringAdditions.swift
58+
Utilities/System.swift
59+
Utilities/Triple+Platforms.swift
60+
Utilities/Triple.swift
61+
Utilities/TypedVirtualPath.swift
62+
Utilities/VirtualPath.swift)
63+
64+
target_link_libraries(SwiftDriver PUBLIC
65+
TSCBasic
66+
SwiftOptions
67+
LLBuild
68+
llbuildSwift
69+
CYaml
70+
Yams)

‎Sources/SwiftOptions/CMakeLists.txt

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# This source file is part of the Swift.org open source project
2+
#
3+
# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
4+
# Licensed under Apache License v2.0 with Runtime Library Exception
5+
#
6+
# See http://swift.org/LICENSE.txt for license information
7+
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
8+
9+
add_library(SwiftOptions
10+
DriverKind.swift
11+
Option.swift
12+
OptionTable.swift
13+
ParsedOptions.swift
14+
ExtraOptions.swift
15+
OptionParsing.swift
16+
Options.swift
17+
PrefixTrie.swift)
18+
target_link_libraries(SwiftOptions PUBLIC
19+
TSCBasic)
20+
21+
# NOTE: workaround for CMake not setting up include flags yet
22+
set_target_properties(SwiftOptions PROPERTIES
23+
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})

‎Sources/swift-driver/CMakeLists.txt

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# This source file is part of the Swift.org open source project
2+
#
3+
# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
4+
# Licensed under Apache License v2.0 with Runtime Library Exception
5+
#
6+
# See http://swift.org/LICENSE.txt for license information
7+
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
8+
9+
add_executable(swift-driver
10+
main.swift)
11+
target_link_libraries(swift-driver PUBLIC
12+
SwiftDriver)
13+
14+

‎Sources/swift-help/CMakeLists.txt

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# This source file is part of the Swift.org open source project
2+
#
3+
# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
4+
# Licensed under Apache License v2.0 with Runtime Library Exception
5+
#
6+
# See http://swift.org/LICENSE.txt for license information
7+
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
8+
9+
add_executable(swift-help
10+
main.swift)
11+
target_link_libraries(swift-help PUBLIC
12+
SwiftOptions)
13+

‎cmake/modules/FindLLBuild.cmake

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# This source file is part of the Swift.org open source project
2+
#
3+
# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
4+
# Licensed under Apache License v2.0 with Runtime Library Exception
5+
#
6+
# See http://swift.org/LICENSE.txt for license information
7+
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
8+
9+
if(TARGET llbuildSwift)
10+
return()
11+
endif()
12+
13+
include(CMakeFindFrameworks)
14+
cmake_find_frameworks(llbuild)
15+
if(llbuild_FRAMEWORKS)
16+
if(NOT TARGET llbuildSwift)
17+
add_library(llbuildSwift UNKNOWN IMPORTED)
18+
set_target_properties(llbuildSwift PROPERTIES
19+
FRAMEWORK TRUE
20+
INTERFACE_COMPILE_OPTIONS -F${llbuild_FRAMEWORKS}
21+
IMPORTED_LOCATION ${llbuild_FRAMEWORKS}/llbuild.framework/llbuild)
22+
endif()
23+
24+
include(FindPackageHandleStandardArgs)
25+
find_package_handle_standard_args(LLBuild
26+
REQUIRED_VARS llbuild_FRAMEWORKS)
27+
else()
28+
find_library(libllbuild_LIBRARIES libllbuild)
29+
find_file(libllbuild_INCLUDE_DIRS llbuild/llbuild.h)
30+
31+
find_library(llbuildSwift_LIBRARIES llbuildSwift)
32+
find_file(llbuildSwift_INCLUDE_DIRS llbuildSwift.swiftmodule)
33+
34+
include(FindPackageHandleStandardArgs)
35+
find_package_handle_standard_args(LLBuild REQUIRED_VARS
36+
libllbuild_LIBRARIES
37+
libllbuild_INCLUDE_DIRS
38+
llbuildSwift_LIBRARIES
39+
llbuildSwift_INCLUDE_DIRS)
40+
41+
if(NOT TARGET libllbuild)
42+
add_library(libllbuild UNKNOWN IMPORTED)
43+
get_filename_component(libllbuild_INCLUDE_DIRS
44+
${libllbuild_INCLUDE_DIRS} DIRECTORY)
45+
set_target_properties(libllbuild PROPERTIES
46+
INTERFACE_INCLUDE_DIRECTORIES ${libllbuild_INCLUDE_DIRS}
47+
IMPORTED_LOCATION ${libllbuild_LIBRARIES})
48+
endif()
49+
if(NOT TARGET llbuildSwift)
50+
add_library(llbuildSwift UNKNOWN IMPORTED)
51+
get_filename_component(llbuildSwift_INCLUDE_DIRS
52+
${llbuildSwift_INCLUDE_DIRS} DIRECTORY)
53+
set_target_properties(llbuildSwift PROPERTIES
54+
INTERFACE_LINK_LIBRARIES libllbuild
55+
INTERFACE_INCLUDE_DIRECTORIES ${llbuildSwift_INCLUDE_DIRS}
56+
IMPORTED_LOCATION ${llbuildSwift_LIBRARIES})
57+
endif()
58+
endif()

0 commit comments

Comments
 (0)