Revert "Merge pull request #785 from compnerd/references-available-up…

…on-request"

This reverts commit a5167e2, reversing
changes made to fa1b4ae.

.gitignore

@@ -29,3 +29,5 @@ config
 configure
 libtool
 .dirstamp
+/dispatch/module.modulemap
+/private/module.modulemap

CMakeLists.txt

@@ -261,12 +261,26 @@ endif()
 
 
 if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
- add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-fmodule-map-file=${PROJECT_SOURCE_DIR}/dispatch/darwin/module.modulemap>
- $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-fmodule-map-file=${PROJECT_SOURCE_DIR}/private/darwin/module.modulemap>)
+ add_custom_command(OUTPUT
+ "${PROJECT_SOURCE_DIR}/dispatch/module.modulemap"
+ "${PROJECT_SOURCE_DIR}/private/module.modulemap"
+ COMMAND
+ ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/dispatch/darwin/module.modulemap" "${PROJECT_SOURCE_DIR}/dispatch/module.modulemap"
+ COMMAND
+ ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/private/darwin/module.modulemap" "${PROJECT_SOURCE_DIR}/private/module.modulemap")
 else()
- add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-fmodule-map-file=${PROJECT_SOURCE_DIR}/dispatch/generic/module.modulemap>
- $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-fmodule-map-file=${PROJECT_SOURCE_DIR}/private/generic/module.modulemap>)
+ add_custom_command(OUTPUT
+ "${PROJECT_SOURCE_DIR}/dispatch/module.modulemap"
+ "${PROJECT_SOURCE_DIR}/private/module.modulemap"
+ COMMAND
+ ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/dispatch/generic/module.modulemap" "${PROJECT_SOURCE_DIR}/dispatch/module.modulemap"
+ COMMAND
+ ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/private/generic/module.modulemap" "${PROJECT_SOURCE_DIR}/private/module.modulemap")
 endif()
+add_custom_target(module-maps ALL
+ DEPENDS
+ "${PROJECT_SOURCE_DIR}/dispatch/module.modulemap"
+ "${PROJECT_SOURCE_DIR}/private/module.modulemap")
 
 configure_file("${PROJECT_SOURCE_DIR}/cmake/config.h.in"
  "${PROJECT_BINARY_DIR}/config/config_ac.h")

dispatch/CMakeLists.txt

@@ -1,13 +1,4 @@
 
-if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
- set(DISPATCH_MODULE_MAP ${PROJECT_SOURCE_DIR}/dispatch/darwin/module.modulemap)
-else()
- set(DISPATCH_MODULE_MAP ${PROJECT_SOURCE_DIR}/dispatch/generic/module.modulemap)
-endif()
-configure_file(dispatch-vfs.yaml.in
- ${CMAKE_BINARY_DIR}/dispatch-vfs-overlay.yaml
- @ONLY)
-
 install(FILES
  base.h
  block.h
@@ -25,8 +16,19 @@ install(FILES
  DESTINATION
  "${INSTALL_DISPATCH_HEADERS_DIR}")
 if(ENABLE_SWIFT)
+ set(base_dir "${CMAKE_CURRENT_SOURCE_DIR}")
+ if(NOT BUILD_SHARED_LIBS)
+ set(base_dir "${CMAKE_CURRENT_SOURCE_DIR}/generic_static")
+ endif()
+
+ get_filename_component(
+ MODULE_MAP
+ module.modulemap
+ REALPATH
+ BASE_DIR "${base_dir}")
+
  install(FILES
- ${DISPATCH_MODULE_MAP}
+ ${MODULE_MAP}
  DESTINATION
  "${INSTALL_DISPATCH_HEADERS_DIR}")
 endif()

src/swift/CMakeLists.txt

@@ -33,8 +33,6 @@ target_compile_options(swiftDispatch PRIVATE
  "SHELL:-Xcc -fmodule-map-file=${PROJECT_SOURCE_DIR}/dispatch/module.modulemap"
  "SHELL:-Xcc -I${PROJECT_SOURCE_DIR}"
  "SHELL:-Xcc -I${PROJECT_SOURCE_DIR}/src/swift/shims")
-target_compile_options(swiftDispatch PUBLIC
- "SHELL:-vfsoverlay ${CMAKE_BINARY_DIR}/dispatch-vfs-overlay.yaml")
 set_target_properties(swiftDispatch PROPERTIES
  Swift_MODULE_NAME Dispatch
  Swift_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/swift
@@ -44,6 +42,7 @@ target_link_libraries(swiftDispatch PRIVATE
  BlocksRuntime::BlocksRuntime)
 target_link_libraries(swiftDispatch PUBLIC
  dispatch)
+add_dependencies(swiftDispatch module-maps)
 
 get_swift_host_arch(swift_arch)
 install(FILES