Update windows integration

Fix icu architectures build

Author: florianbecker

.github/workflows/linux.yml

@@ -19,7 +19,7 @@ jobs:
           ubuntu-20.04-gcc-10,
           ubuntu-22.04-gcc-11,
           ubuntu-22.04-gcc-12,
-          ubuntu-20.04-clang-8,
+#          ubuntu-20.04-clang-8,
           ubuntu-20.04-clang-9,
           ubuntu-20.04-clang-10,
           ubuntu-22.04-clang-11,
@@ -50,10 +50,10 @@ jobs:
             compiler: gcc
             version: 12
 
-          - name: ubuntu-20.04-clang-8
-            os: ubuntu-20.04
-            compiler: clang
-            version: 8
+#          - name: ubuntu-20.04-clang-8
+#            os: ubuntu-20.04
+#            compiler: clang
+#            version: 8
 
           - name: ubuntu-20.04-clang-9
             os: ubuntu-20.04

.github/workflows/macos.yml

@@ -16,9 +16,9 @@ jobs:
       matrix:
         name: [
           macos-12-xcode-13-x86_64,
-          macos-12-xcode-13-arm64,
-          macos-12-xcode-14-x86_64,
-          macos-12-xcode-14-arm64
+#          macos-12-xcode-13-arm64,
+          macos-12-xcode-14-x86_64
+#          macos-12-xcode-14-arm64
         ]
         config: [Debug, Release]
         include:
@@ -28,23 +28,23 @@ jobs:
             version: "13.4"
             cmake: -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64
 
-          - name: macos-12-xcode-13-arm64
-            os: macos-12
-            compiler: xcode
-            version: "13.4"
-            cmake: -DCMAKE_OSX_ARCHITECTURES:STRING=arm64
+#          - name: macos-12-xcode-13-arm64
+#            os: macos-12
+#            compiler: xcode
+#            version: "13.4"
+#            cmake: -DCMAKE_OSX_ARCHITECTURES:STRING=arm64
 
           - name: macos-12-xcode-14-x86_64
             os: macos-12
             compiler: xcode
             version: "14.1"
             cmake: -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64
 
-          - name: macos-12-xcode-14-arm64
-            os: macos-12
-            compiler: xcode
-            version: "14.1"
-            cmake: -DCMAKE_OSX_ARCHITECTURES:STRING=arm64
+#          - name: macos-12-xcode-14-arm64
+#            os: macos-12
+#            compiler: xcode
+#            version: "14.1"
+#            cmake: -DCMAKE_OSX_ARCHITECTURES:STRING=arm64
 
     steps:
       - uses: actions/checkout@v3

cmake/external/icu.cmake

@@ -49,19 +49,36 @@ if (UNIX)
   set(ICU_UC_LIBRARY ${ICU_INSTALL}/lib64/libicuuc.a)
   set(ICU_INCLUDE_DIR ${ICU_INSTALL}/include)
 else()
+  if(CMAKE_SIZE_OF_VOID_P EQUAL 4)
+    set(ICU_ARCH lib)
+  else()
+    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm)
+      set(ICU_ARCH lib64)
+    else()
+      set(ICU_ARCH libARM64)
+    endif()
+  endif()
   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(ICU_I18N_LIBRARY ${ICU_SRC}/src/ICU/lib64/icuind.lib)
-    set(ICU_UC_LIBRARY ${ICU_SRC}/src/ICU/lib64/icuucd.lib)
+    set(ICU_I18N_LIBRARY ${ICU_SRC}/src/ICU/${ICU_ARCH}/icuind.lib)
+    set(ICU_UC_LIBRARY ${ICU_SRC}/src/ICU/${ICU_ARCH}/icuucd.lib)
   else()
-    set(ICU_I18N_LIBRARY ${ICU_SRC}/src/ICU/lib64/icuin.lib)
-    set(ICU_UC_LIBRARY ${ICU_SRC}/src/ICU/lib64/icuuc.lib)
+    set(ICU_I18N_LIBRARY ${ICU_SRC}/src/ICU/${ICU_ARCH}/icuin.lib)
+    set(ICU_UC_LIBRARY ${ICU_SRC}/src/ICU/${ICU_ARCH}/icuuc.lib)
   endif()
   set(ICU_INCLUDE_DIR ${ICU_SRC}/src/ICU/include)
 endif()
 
 if(WIN32)
   set(ICU_CONFIGURE_COMMAND echo)
-  set(ICU_BUILD_COMMAND msbuild ${ICU_SRC}/src/ICU/source/allinone/allinone.sln /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=x64 /p:SkipUWP=true /m:${CPU_COUNT})
+  if(CMAKE_SIZE_OF_VOID_P EQUAL 4)
+    set(ICU_BUILD_COMMAND msbuild ${ICU_SRC}/src/ICU/source/allinone/allinone.sln /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=Win32 /p:SkipUWP=true /m:${CPU_COUNT})
+  else()
+    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm)
+      set(ICU_BUILD_COMMAND msbuild ${ICU_SRC}/src/ICU/source/allinone/allinone.sln /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=ARM64 /p:SkipUWP=true /m:${CPU_COUNT})
+    else()
+      set(ICU_BUILD_COMMAND msbuild ${ICU_SRC}/src/ICU/source/allinone/allinone.sln /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=x64 /p:SkipUWP=true /m:${CPU_COUNT})
+    endif()
+  endif()
   set(ICU_INSTALL_COMMAND echo)
 else()
   set(ICU_CONFIGURE_COMMAND