Skip to content

Commit 21e779f

Browse files
[CMake] Change include path in HeaderDependencies.cpp
Update the #include in generated HeaderDependencies.cpp so it doesn't need a special include path that points into `include/swift`. In the swift sub-directory, there is a `Strings.h` that can be mistaken as <string.h> on a case-insensitive file system. rdar://119997353
1 parent 2608746 commit 21e779f

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

SwiftCompilerSources/CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function(add_swift_compiler_module module)
3939
get_property(modules GLOBAL PROPERTY swift_compiler_modules)
4040
set_property(GLOBAL PROPERTY swift_compiler_modules ${modules} ${module})
4141
endfunction()
42-
42+
4343
# Add source files to a swift compiler module.
4444
#
4545
function(swift_compiler_sources module)
@@ -273,9 +273,9 @@ else()
273273
"
274274
#define COMPILED_WITH_SWIFT
275275
276-
#include \"Basic/BasicBridging.h\"
277-
#include \"SIL/SILBridging.h\"
278-
#include \"SILOptimizer/OptimizerBridging.h\"
276+
#include \"swift/Basic/BasicBridging.h\"
277+
#include \"swift/SIL/SILBridging.h\"
278+
#include \"swift/SILOptimizer/OptimizerBridging.h\"
279279
")
280280
add_custom_command(
281281
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/HeaderDependencies.cpp"
@@ -287,9 +287,8 @@ else()
287287

288288
# step 2: build a library containing that source file. This library depends on all the included header files.
289289
# The swift modules can now depend on that target.
290-
# Note that this library is unused, i.e. not linked to anything.
290+
# Note that this library is unused, i.e. not linked to anything.
291291
add_library(importedHeaderDependencies "${CMAKE_CURRENT_BINARY_DIR}/HeaderDependencies.cpp")
292-
target_include_directories(importedHeaderDependencies PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../include/swift")
293292

294293
# When building unified, we need to make sure all the Clang headers are
295294
# generated before we try to use them.

0 commit comments

Comments
 (0)