Flatten source headers into single directory

Author: jmschonfeld

Package.swift

@@ -43,6 +43,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"),

icuSources/CMakeLists.txt

@@ -494,9 +494,6 @@ target_include_directories(_FoundationICU
         i18n/
         io/
     PUBLIC
-        common/include/
-        i18n/include/
-        io/include/
         include/)
 
 target_link_libraries(_FoundationICU PRIVATE stdc++)
@@ -515,22 +512,8 @@ install(TARGETS _FoundationICU
 
 # Install headers
 install(DIRECTORY
-            common/include/
+            include/
         DESTINATION
             lib/${install_directory})
-install(DIRECTORY
-            i18n/include/
-        DESTINATION
-            lib/${install_directory})
-install(DIRECTORY
-            io/include/
-        DESTINATION
-            lib/${install_directory})
-
-# Install module map
-install(FILES
-            module.modulemap
-        DESTINATION
-            lib/${install_directory}/_foundation_unicode)
 
-set_property(GLOBAL APPEND PROPERTY SWIFT_FOUNDATION_ICU_EXPORTS _FoundationICU)
+set_property(GLOBAL APPEND PROPERTY SWIFT_FOUNDATION_ICU_EXPORTS _FoundationICU)

icuSources/common/icu_packaged_data.cpp

@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if USE_PACKAGE_DATA
+
 #include "icu_packaged_main_data.0.inc.h"
 #include "icu_packaged_main_data.1.inc.h"
 #include "icu_packaged_main_data.2.inc.h"
@@ -24,3 +26,5 @@ extern "C" U_EXPORT uint8_t const U_ICUDATA_ENTRY_POINT[] __attribute__ ((aligne
     __ICU_PACKAGED_MAIN_DATA_CHUNK_2,
     __ICU_PACKAGED_MAIN_DATA_CHUNK_3,
 };
+
+#endif