Fix windows build and testrun

Author: florianbecker

cmake/external/icu.cmake

@@ -50,21 +50,26 @@ if (UNIX)
   set(ICU_INCLUDE_DIR ${ICU_INSTALL}/include)
 else()
   if(CMAKE_SIZE_OF_VOID_P EQUAL 4)
-    set(ICU_ARCH lib)
+    set(ICU_ARCH )
   else()
     if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm)
-      set(ICU_ARCH lib64)
+      set(ICU_ARCH ARM64)
     else()
-      set(ICU_ARCH libARM64)
+      set(ICU_ARCH 64)
     endif()
   endif()
   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(ICU_I18N_LIBRARY ${ICU_SRC}/src/ICU/${ICU_ARCH}/icuind.lib)
-    set(ICU_UC_LIBRARY ${ICU_SRC}/src/ICU/${ICU_ARCH}/icuucd.lib)
+    set(ICU_I18N_LIBRARY ${ICU_SRC}/src/ICU/lib${ICU_ARCH}/icuind.lib)
+    set(ICU_UC_LIBRARY ${ICU_SRC}/src/ICU/lib${ICU_ARCH}/icuucd.lib)
+    set(ICU_I18N_DLL ${ICU_SRC}/src/ICU/bin${ICU_ARCH}/icuin72d.dll)
+    set(ICU_UC_DLL ${ICU_SRC}/src/ICU/bin${ICU_ARCH}/icuuc72d.dll)
   else()
-    set(ICU_I18N_LIBRARY ${ICU_SRC}/src/ICU/${ICU_ARCH}/icuin.lib)
-    set(ICU_UC_LIBRARY ${ICU_SRC}/src/ICU/${ICU_ARCH}/icuuc.lib)
+    set(ICU_I18N_LIBRARY ${ICU_SRC}/src/ICU/lib${ICU_ARCH}/icuin.lib)
+    set(ICU_UC_LIBRARY ${ICU_SRC}/src/ICU/lib${ICU_ARCH}/icuuc.lib)
+    set(ICU_I18N_DLL ${ICU_SRC}/src/ICU/bin${ICU_ARCH}/icuin72.dll)
+    set(ICU_UC_DLL ${ICU_SRC}/src/ICU/bin${ICU_ARCH}/icuuc72.dll)
   endif()
+  set(ICU_DATA_DLL ${ICU_SRC}/src/ICU/bin${ICU_ARCH}/icudt72.dll)
   set(ICU_INCLUDE_DIR ${ICU_SRC}/src/ICU/include)
 endif()
 
@@ -128,3 +133,9 @@ add_library(ICU::uc STATIC IMPORTED GLOBAL)
 set_property(TARGET ICU::uc PROPERTY IMPORTED_LOCATION ${ICU_UC_LIBRARY})
 set_property(TARGET ICU::uc PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${ICU_INCLUDE_DIR})
 add_dependencies(ICU::uc ICU)
+
+if(WIN32)
+  add_custom_command(TARGET ICU POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${ICU_DATA_DLL} ${CMAKE_BINARY_DIR}/tests)
+  add_custom_command(TARGET ICU POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${ICU_I18N_DLL} ${CMAKE_BINARY_DIR}/tests)
+  add_custom_command(TARGET ICU POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${ICU_UC_DLL} ${CMAKE_BINARY_DIR}/tests)
+endif()

tests/CMakeLists.txt

@@ -47,28 +47,7 @@ function(make_test target)
 endfunction()
 
 make_test(distance)
-
-project(test_dump)
-
-add_executable(${PROJECT_NAME}
-  ${PROJECT_NAME}.cpp
-)
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "[cC][lL][aA][nN][gG]" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
-  set(${PROJECT_NAME}_libs stdc++fs)
-endif()
-
-target_link_libraries(${PROJECT_NAME}
-  PRIVATE
-  SQLite::Functions
-  GTest::gtest_main
-  ${${PROJECT_NAME}_libs}
-)
-
-gtest_add_tests(${PROJECT_NAME}
-  SOURCES ${PROJECT_NAME}.cpp
-)
-
+make_test(dump)
 make_test(transliteration)
 
 include(${CMAKE}/sanitizer_options.cmake)