Skip to content

Commit 4f91a70

Browse files
authored
build: simplify the build rules with newer CMake (#7119)
Swift now requires CMake 3.19.6 to build. Update the CMake requirement to 3.19 to allow us to simplify the build logic by removing the workarounds for older releases.
1 parent 2564e41 commit 4f91a70

File tree

1 file changed

+6
-17
lines changed

1 file changed

+6
-17
lines changed

CMakeLists.txt

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,17 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
cmake_minimum_required(VERSION 3.15.1)
9+
cmake_minimum_required(VERSION 3.19)
1010

1111
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
1212

1313
project(SwiftPM LANGUAGES C Swift)
1414

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-
add_compile_options(-DUSE_IMPL_ONLY_IMPORTS)
23-
15+
set(CMAKE_Swift_LANGUAGE_VERSION 5)
2416
set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
2517

26-
if(CMAKE_VERSION VERSION_LESS 3.16 AND CMAKE_SYSTEM_NAME STREQUAL Windows)
27-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
28-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
29-
else()
30-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
31-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
32-
endif()
18+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
19+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
3320
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
3421

3522
option(BUILD_SHARED_LIBS "Build shared libraries by default" YES)
@@ -44,6 +31,8 @@ if(BUILD_SHARED_LIBS)
4431
set(CMAKE_POSITION_INDEPENDENT_CODE YES)
4532
endif()
4633

34+
add_compile_options(-DUSE_IMPL_ONLY_IMPORTS)
35+
4736
if(FIND_PM_DEPS)
4837
find_package(SwiftSystem CONFIG REQUIRED)
4938
find_package(TSC CONFIG REQUIRED)

0 commit comments

Comments
 (0)