Skip to content

Commit 5863b1a

Browse files
committed
Runtimes: split up C++ and Swift specific flags (NFC)
This splits up the flags and re-orders some of the condition for the application. Because the flags are now categorised by the language promote the other half of the condition to the front.
1 parent 2dbffa2 commit 5863b1a

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Runtimes/Core/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,12 @@ add_compile_definitions(
135135
add_compile_options(
136136
$<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
137137
$<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
138-
$<$<COMPILE_LANGUAGE:CXX>:-funwind-tables>
139-
"$<$<AND:$<COMPILE_LANGUAGE:Swift>,$<NOT:$<BOOL:${SwiftCore_ENABLE_OBJC_INTEROP}>>>:SHELL:-Xfrontend -disable-objc-interop>"
140-
"$<$<AND:$<COMPILE_LANGUAGE:Swift>,$<PLATFORM_ID:Windows>>:SHELL:-Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules>"
141-
$<$<AND:$<COMPILE_LANGUAGE:Swift>,$<BOOL:${SwiftCore_ENABLE_LIBRARY_EVOLUTION}>>:-enable-library-evolution>)
138+
$<$<COMPILE_LANGUAGE:CXX>:-funwind-tables>)
139+
140+
add_compile_options(
141+
"$<$<AND:$<NOT:$<BOOL:${SwiftCore_ENABLE_OBJC_INTEROP}>>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -disable-objc-interop>"
142+
"$<$<AND:$<PLATFORM_ID:Windows>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules>"
143+
"$<$<AND:$<BOOL:${SwiftCore_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>")
142144

143145
include_directories(include)
144146

0 commit comments

Comments
 (0)