Skip to content

Commit 9b6c04e

Browse files
authored
Merge pull request swiftlang#81404 from compnerd/disable
Runtimes: disable CMP0157 when building with the old driver
2 parents cf461be + fcb6d54 commit 9b6c04e

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Runtimes/Overlay/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN YES)
77

88
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
99

10+
if(POLICY CMP0157 AND CMAKE_Swift_COMPILER_USE_OLD_DRIVER)
11+
cmake_policy(SET CMP0157 OLD)
12+
endif()
13+
1014
# NOTE: always use the 3-component style as the expansion as
1115
# `${PROJECT_VERSION}` will not extend this to the complete form and this can
1216
# change the behaviour for comparison with non-SemVer compliant parsing. If

Runtimes/Supplemental/StringProcessing/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ set(CMAKE_POSITION_INDEPENDENT_CODE YES)
44

55
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake/modules")
66

7+
if(POLICY CMP0157 AND CMAKE_Swift_COMPILER_USE_OLD_DRIVER)
8+
cmake_policy(SET CMP0157 OLD)
9+
endif()
10+
711
if($ENV{BUILD_NUMBER})
812
math(EXPR BUILD_NUMBER "$ENV{BUILD_NUMBER} % 65535")
913
set(BUILD_NUMBER ".${BUILD_NUMBER}")

0 commit comments

Comments
 (0)