Merge pull request #2828 from rintaro/cmake-package-name-toolchain

[CMake] Accept 'PACKAGE_NAME' from the parent project

Author: rintaro

CMakeLists.txt

@@ -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.

cmake/modules/AddSwiftHostLibrary.cmake

@@ -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"