Skip to content

[CMake] Accept 'PACKAGE_NAME' from the parent project #2828

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
Aug 29, 2024
Merged

[CMake] Accept 'PACKAGE_NAME' from the parent project #2828

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,12 @@ endif()
if(NOT DEFINED SWIFTSYNTAX_EMIT_MODULE)
set(SWIFTSYNTAX_EMIT_MODULE TRUE)
endif()
if(SWIFTSYNTAX_EMIT_MODULE)
swift_get_package_cmo_support(SWIFT_PACKAGE_CMO_SUPPORT)

if(NOT DEFINED Swift_COMPILER_PACKAGE_CMO_SUPPORT AND SWIFTSYNTAX_EMIT_MODULE)
swift_get_package_cmo_support(Swift_COMPILER_PACKAGE_CMO_SUPPORT)
endif()
if(NOT DEFINED SWIFTSYNTAX_PACKAGE_NAME)
set(SWIFTSYNTAX_PACKAGE_NAME "${SWIFT_MODULE_ABI_NAME_PREFIX}${PROJECT_NAME}")
endif()

# Determine the module triple.
Expand Down
8 changes: 4 additions & 4 deletions cmake/modules/AddSwiftHostLibrary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,17 @@ function(add_swift_syntax_library name)
>)

# Enable package CMO if possible.
if(SWIFT_PACKAGE_CMO_SUPPORT STREQUAL "IMPLEMENTED")
if(Swift_COMPILER_PACKAGE_CMO_SUPPORT STREQUAL "IMPLEMENTED")
target_compile_options("${target}" PRIVATE
$<$<COMPILE_LANGUAGE:Swift>:
"SHELL:-package-name ${SWIFT_MODULE_ABI_NAME_PREFIX}${PROJECT_NAME}"
"SHELL:-package-name ${SWIFTSYNTAX_PACKAGE_NAME}"
"SHELL:-Xfrontend -package-cmo"
"SHELL:-Xfrontend -allow-non-resilient-access"
>)
elseif(SWIFT_PACKAGE_CMO_SUPPORT STREQUAL "EXPERIMENTAL")
elseif(Swift_COMPILER_PACKAGE_CMO_SUPPORT STREQUAL "EXPERIMENTAL")
target_compile_options("${target}" PRIVATE
$<$<COMPILE_LANGUAGE:Swift>:
"SHELL:-package-name ${SWIFT_MODULE_ABI_NAME_PREFIX}${PROJECT_NAME}"
"SHELL:-package-name ${SWIFTSYNTAX_PACKAGE_NAME}"
"SHELL:-Xfrontend -experimental-package-cmo"
"SHELL:-Xfrontend -experimental-allow-non-resilient-access"
"SHELL:-Xfrontend -experimental-package-bypass-resilience"
Expand Down