[build] Fix generated header files in standalone overlay builds. (#21206)

This commit is contained in:
Greg Parker
2018-12-14 13:28:53 -08:00
committed by GitHub
parent 4f25c55723
commit 41f048410a
2 changed files with 18 additions and 6 deletions

View File

@@ -58,6 +58,10 @@ precondition(SWIFT_DEST_ROOT)
precondition(SWIFT_HOST_VARIANT_SDK)
precondition(TOOLCHAIN_DIR)
# Some overlays include the runtime's headers,
# and some of those headers are generated at build time.
add_subdirectory("${SWIFT_SOURCE_DIR}/include" "swift/include")
# Without this line, installing components is broken. This needs refactoring.
swift_configure_components()

View File

@@ -1,7 +1,15 @@
configure_file(Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h
ESCAPE_QUOTES @ONLY)
if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY OR SWIFT_BUILD_STANDALONE_OVERLAY)
add_subdirectory(Runtime)
endif()
if(SWIFT_BUILD_REMOTE_MIRROR)
add_subdirectory(SwiftRemoteMirror)
endif()
if(SWIFT_INCLUDE_TOOLS)
configure_file(Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h
ESCAPE_QUOTES @ONLY)
add_subdirectory(Option)
add_subdirectory(Syntax)
endif()
add_subdirectory(Option)
add_subdirectory(Runtime)
add_subdirectory(SwiftRemoteMirror)
add_subdirectory(Syntax)