Skip to content

Commit 464a3e6

Browse files
committed
build: simplify the build rules with newer CMake (NFC)
Swift now requires CMake 3.19.6 as a minimum version. Assume that we can use CMake newer than 3.16 and simplify the build rules.
1 parent c334dd4 commit 464a3e6

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

CMakeLists.txt

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1-
cmake_minimum_required(VERSION 3.15.1)
1+
cmake_minimum_required(VERSION 3.19)
22

33
project(SwiftTSC LANGUAGES C Swift)
44

5-
set(SWIFT_VERSION 5)
6-
set(CMAKE_Swift_LANGUAGE_VERSION ${SWIFT_VERSION})
7-
if(CMAKE_VERSION VERSION_LESS 3.16)
8-
add_compile_options($<$<COMPILE_LANGUAGE:Swift>:-swift-version$<SEMICOLON>${SWIFT_VERSION}>)
9-
# Workaround for CMake 3.15 which doesn't link libraries properly on Windows
10-
set(CMAKE_LINK_LIBRARY_FLAG "-l")
11-
endif()
12-
5+
set(CMAKE_Swift_LANGUAGE_VERSION 5)
136
set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
147

15-
if(CMAKE_VERSION VERSION_LESS 3.16 AND CMAKE_SYSTEM_NAME STREQUAL Windows)
16-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
17-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
18-
else()
19-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
20-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
21-
endif()
8+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
9+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
2210
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
2311

2412
set(CMAKE_DISABLE_IN_SOURCE_BUILD YES)

0 commit comments

Comments
 (0)