[CMake] Update defines to indicate combined, dynamic module build (#28)

Author: jmschonfeld

CMakeLists.txt

@@ -28,10 +28,8 @@ set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
 
 # Build flags
 add_compile_definitions(
-    $<$<COMPILE_LANGUAGE:C,CXX>:U_ATTRIBUTE_DEPRECATED="">
     $<$<COMPILE_LANGUAGE:C,CXX>:U_SHOW_CPLUSPLUS_API=1>
     $<$<COMPILE_LANGUAGE:C,CXX>:U_SHOW_INTERNAL_API=1>
-    $<$<COMPILE_LANGUAGE:C,CXX>:U_STATIC_IMPLEMENTATION>
     $<$<COMPILE_LANGUAGE:C,CXX>:U_TIMEZONE_PACKAGE="icutz44l">
     $<$<COMPILE_LANGUAGE:C,CXX>:FORTIFY_SOURCE=2>
     $<$<COMPILE_LANGUAGE:C,CXX>:STD_INSPIRED>
@@ -40,7 +38,10 @@ add_compile_definitions(
     $<$<COMPILE_LANGUAGE:C,CXX>:U_HAVE_XLOCALE_H=1>
     $<$<COMPILE_LANGUAGE:C,CXX>:U_HAVE_STRING_VIEW=1>
     $<$<COMPILE_LANGUAGE:C,CXX>:U_DISABLE_RENAMING=1>
+    $<$<COMPILE_LANGUAGE:C,CXX>:U_COMBINED_IMPLEMENTATION>
     $<$<COMPILE_LANGUAGE:C,CXX>:U_COMMON_IMPLEMENTATION>
+    $<$<COMPILE_LANGUAGE:C,CXX>:U_I18N_IMPLEMENTATION>
+    $<$<COMPILE_LANGUAGE:C,CXX>:U_IO_IMPLEMENTATION>
     $<$<COMPILE_LANGUAGE:C,CXX>:ICU_DATA_DIR="/usr/share/icu">
     $<$<COMPILE_LANGUAGE:C,CXX>:USE_PACKAGE_DATA=1>
     $<$<COMPILE_LANGUAGE:C,CXX>:APPLE_ICU_CHANGES=1>)

Package.swift

@@ -5,7 +5,6 @@ import PackageDescription
 
 var buildSettings: [CXXSetting] = [
     .define("DEBUG", to: "1", .when(configuration: .debug)),
-    .define("U_ATTRIBUTE_DEPRECATED", to: ""),
     .define("U_SHOW_CPLUSPLUS_API", to: "1"),
     .define("U_SHOW_INTERNAL_API", to: "1"),
     .define("U_STATIC_IMPLEMENTATION"),
@@ -34,7 +33,10 @@ var buildSettings: [CXXSetting] = [
     .define("U_HAVE_XLOCALE_H", to: "1"),
     .define("U_HAVE_STRING_VIEW", to: "1"),
     .define("U_DISABLE_RENAMING", to: "1"),
+    .define("U_COMBINED_IMPLEMENTATION"),
     .define("U_COMMON_IMPLEMENTATION"),
+    .define("U_I18N_IMPLEMENTATION"),
+    .define("U_IO_IMPLEMENTATION"),
     // Where data are stored
     .define("ICU_DATA_DIR", to: "\"/usr/share/icu/\""),
     .define("USE_PACKAGE_DATA", to: "1"),
@@ -43,10 +45,7 @@ var buildSettings: [CXXSetting] = [
     .headerSearchPath("common"),
     .headerSearchPath("io"),
     .headerSearchPath("i18n"),
-    .headerSearchPath("include"),
-    .define("U_I18N_IMPLEMENTATION"),
     .define("SWIFT_PACKAGE", to: "1", .when(platforms: [.linux])),
-    .define("U_IO_IMPLEMENTATION"),
 ]
 
 #if os(Windows)

icuSources/CMakeLists.txt

@@ -22,7 +22,6 @@ add_subdirectory(common)
 add_subdirectory(i18n)
 add_subdirectory(io)
 
-target_compile_definitions(_FoundationICU PRIVATE U_I18N_IMPLEMENTATION U_IO_IMPLEMENTATION)
 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
     target_compile_definitions(_FoundationICU PRIVATE SWIFT_PACKAGE=1)
 endif()