Skip to content

Commit e8d148a

Browse files
committed
[build] Move addition of SWIFT_BUILD_SWIFT_SYNTAX preprocessor flag to top-level CMakeLists.txt
1 parent 7d84f08 commit e8d148a

File tree

9 files changed

+1
-45
lines changed

9 files changed

+1
-45
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,7 @@ if(SWIFT_BUILD_SWIFT_SYNTAX)
872872
message(WARNING "Force setting BOOTSTRAPPING=HOSTTOOLS because Swift parser integration is enabled")
873873
set(BOOTSTRAPPING_MODE "HOSTTOOLS")
874874
endif()
875+
add_definitions(-DSWIFT_BUILD_SWIFT_SYNTAX)
875876
endif()
876877

877878
if(BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|.*-WITH-HOSTLIBS")

lib/AST/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,6 @@ target_link_libraries(swiftAST INTERFACE
154154
clangAPINotes
155155
clangBasic)
156156

157-
if(SWIFT_BUILD_SWIFT_SYNTAX)
158-
target_compile_definitions(swiftAST
159-
PRIVATE
160-
SWIFT_BUILD_SWIFT_SYNTAX
161-
)
162-
endif()
163-
164157
target_link_libraries(swiftAST
165158
PUBLIC swiftBasic
166159
PRIVATE swiftMarkup)

lib/DriverTool/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@ if(NOT SWIFT_BUILT_STANDALONE)
3535
add_dependencies(swiftDriverTool clang-resource-headers)
3636
endif()
3737

38-
if (SWIFT_BUILD_SWIFT_SYNTAX)
39-
target_compile_definitions(swiftDriverTool
40-
PRIVATE
41-
SWIFT_BUILD_SWIFT_SYNTAX
42-
)
43-
endif()
44-
4538
set_swift_llvm_is_available(swiftDriverTool)
4639

4740
set(LLVM_TARGET_DEFINITIONS SwiftCacheToolOptions.td)

lib/Frontend/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,3 @@ target_link_libraries(swiftFrontend PRIVATE
3838
swiftSymbolGraphGen)
3939

4040
set_swift_llvm_is_available(swiftFrontend)
41-
42-
if (SWIFT_BUILD_SWIFT_SYNTAX)
43-
target_compile_definitions(swiftFrontend
44-
PRIVATE
45-
SWIFT_BUILD_SWIFT_SYNTAX
46-
)
47-
endif()

lib/IDE/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ target_link_libraries(swiftIDE PRIVATE
4747
swiftSema)
4848

4949
if (SWIFT_BUILD_SWIFT_SYNTAX)
50-
target_compile_definitions(swiftIDE
51-
PRIVATE
52-
SWIFT_BUILD_SWIFT_SYNTAX
53-
)
5450
target_link_libraries(swiftIDE PRIVATE
5551
swiftIDEUtilsBridging
5652
)

lib/Parse/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ if (SWIFT_BUILD_SWIFT_SYNTAX)
5151
SwiftSyntaxMacros
5252
swiftASTGen
5353
)
54-
55-
target_compile_definitions(swiftParse
56-
PRIVATE
57-
SWIFT_BUILD_SWIFT_SYNTAX
58-
)
5954
endif()
6055

6156
if(SWIFT_BUILD_REGEX_PARSER_IN_COMPILER)

lib/Refactoring/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ target_link_libraries(swiftRefactoring PRIVATE
5050
swiftSema)
5151

5252
if(SWIFT_BUILD_SWIFT_SYNTAX)
53-
target_compile_definitions(swiftRefactoring
54-
PRIVATE
55-
SWIFT_BUILD_SWIFT_SYNTAX
56-
)
5753
target_link_libraries(swiftRefactoring PRIVATE
5854
swiftIDEUtilsBridging
5955
)

lib/Sema/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@ target_link_libraries(swiftSema PRIVATE
8888
swiftSerialization)
8989

9090
if (SWIFT_BUILD_SWIFT_SYNTAX)
91-
target_compile_definitions(swiftSema
92-
PRIVATE
93-
SWIFT_BUILD_SWIFT_SYNTAX
94-
)
9591
target_link_libraries(swiftSema PRIVATE
9692
swiftASTGen)
9793
endif()

tools/SourceKit/lib/SwiftLang/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,3 @@ target_link_libraries(SourceKitSwiftLang PRIVATE
6868
clangAPINotes
6969
clangBasic)
7070
add_dependencies(SourceKitSwiftLang clang-tablegen-targets)
71-
72-
if(SWIFT_BUILD_SWIFT_SYNTAX)
73-
target_compile_definitions(SourceKitSwiftLang
74-
PRIVATE
75-
SWIFT_BUILD_SWIFT_SYNTAX
76-
)
77-
endif()

0 commit comments

Comments
 (0)