Skip to content

[cxx-interop] Install CxxShim library for macCatalyst #76260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2024
Merged

[cxx-interop] Install CxxShim library for macCatalyst #76260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions stdlib/public/Cxx/cxxshim/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ foreach(sdk ${SWIFT_SDKS})
add_custom_command(OUTPUT ${module_dir_static}
COMMAND ${CMAKE_COMMAND} "-E" "make_directory" "${module_dir_static}")
endif()
if(SWIFT_ENABLE_MACCATALYST AND "${sdk}" STREQUAL "OSX")
set(maccatalyst_module_dir "${SWIFTLIB_DIR}/${SWIFT_SDK_MACCATALYST_LIB_SUBDIR}")
add_custom_command(OUTPUT ${maccatalyst_module_dir}
COMMAND ${CMAKE_COMMAND} "-E" "make_directory" "${maccatalyst_module_dir}")
endif()

set(outputs)
foreach(source libcxxshim.modulemap libcxxshim.h libcxxstdlibshim.h)
Expand All @@ -25,11 +30,21 @@ foreach(sdk ${SWIFT_SDKS})
COMMENT "Copying ${source} to ${module_dir_static}")
list(APPEND outputs "${module_dir_static}/${source}")
endif()
if(SWIFT_ENABLE_MACCATALYST AND "${sdk}" STREQUAL "OSX")
add_custom_command(OUTPUT ${maccatalyst_module_dir}/${source}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${source}
COMMAND ${CMAKE_COMMAND} "-E" "copy_if_different" "${CMAKE_CURRENT_SOURCE_DIR}/${source}" "${maccatalyst_module_dir}/${source}"
COMMENT "Copying ${source} to ${maccatalyst_module_dir}")
list(APPEND outputs "${maccatalyst_module_dir}/${source}")
endif()
endforeach()
list(APPEND outputs ${module_dir})
if(SWIFT_BUILD_STATIC_STDLIB OR SWIFT_SDK_${sdk}_STATIC_ONLY)
list(APPEND outputs ${module_dir_static})
endif()
if(SWIFT_ENABLE_MACCATALYST AND "${sdk}" STREQUAL "OSX")
list(APPEND outputs ${maccatalyst_module_dir})
endif()

add_custom_target(cxxshim-${sdk} ALL
DEPENDS ${outputs}
Expand All @@ -45,6 +60,11 @@ foreach(sdk ${SWIFT_SDKS})
DESTINATION "lib/swift_static/${SWIFT_SDK_${sdk}_LIB_SUBDIR}"
COMPONENT compiler)
endif()
if(SWIFT_ENABLE_MACCATALYST AND "${sdk}" STREQUAL "OSX")
swift_install_in_component(FILES libcxxshim.modulemap libcxxshim.h libcxxstdlibshim.h
DESTINATION "lib/swift/${SWIFT_SDK_MACCATALYST_LIB_SUBDIR}"
COMPONENT compiler)
endif()
endforeach()

add_custom_target(libcxxshim_modulemap DEPENDS ${libcxxshim_modulemap_target_list})
Expand Down