Merge pull request #46 from crupest/dev

Fix fxxking Windows CI.

7 files changed, 40 insertions, 8 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e99fc8b6..676531a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,8 +33,8 @@ jobs:
 
       - name: Build
         run: |
-          cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -H. -B./build -G Ninja
-          cmake --build ./build --config Debug --target all
+          cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -S. -Bbuild -G Ninja
+          cmake --build build --config Debug --target all
 
       - name: Test
         working-directory: build
@@ -61,8 +61,8 @@ jobs:
 
       - name: Build
         run: |
-          cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -H. -B./build -G Ninja
-          cmake --build ./build --config Debug --target all
+          cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -S. -Bbuild -G Ninja
+          cmake --build build --config Debug --target all
 
       - name: Test
         working-directory: build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 900f1d2c..4380fe4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.21)
 
 if(NOT CMAKE_TOOLCHAIN_FILE)
 	message("CMAKE_TOOLCHAIN_FILE not set. Begin to find vcpkg toolchain file.")
@@ -19,9 +19,6 @@ project(cru)
 
 enable_testing()
 
-set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-
 if (MSVC)
 	string(REGEX REPLACE "/W[0-4]\\s*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 	add_compile_options(/utf-8 /W4 /WX)
diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt
index 1c669dcc..7926437c 100644
--- a/test/common/CMakeLists.txt
+++ b/test/common/CMakeLists.txt
@@ -12,4 +12,11 @@ if (UNIX)
 	)
 endif()
 
+if (WIN32)
+	add_custom_command(TARGET cru_base_test POST_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:cru_base_test> $<TARGET_FILE_DIR:cru_base_test>
+	COMMAND_EXPAND_LISTS
+	)
+endif()
+
 gtest_discover_tests(cru_base_test)
diff --git a/test/platform/CMakeLists.txt b/test/platform/CMakeLists.txt
index 9414e2b8..5feec2d1 100644
--- a/test/platform/CMakeLists.txt
+++ b/test/platform/CMakeLists.txt
@@ -4,4 +4,11 @@ add_executable(cru_platform_base_test
 )
 target_link_libraries(cru_platform_base_test PRIVATE cru_platform_base cru_test_base)
 
+if (WIN32)
+	add_custom_command(TARGET cru_platform_base_test POST_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:cru_platform_base_test> $<TARGET_FILE_DIR:cru_platform_base_test>
+	COMMAND_EXPAND_LISTS
+	)
+endif()
+
 gtest_discover_tests(cru_platform_base_test)
diff --git a/test/toml/CMakeLists.txt b/test/toml/CMakeLists.txt
index 22766ecd..98270d30 100644
--- a/test/toml/CMakeLists.txt
+++ b/test/toml/CMakeLists.txt
@@ -3,4 +3,11 @@ add_executable(cru_toml_test
 )
 target_link_libraries(cru_toml_test PRIVATE cru_toml cru_test_base)
 
+if (WIN32)
+	add_custom_command(TARGET cru_toml_test POST_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:cru_toml_test> $<TARGET_FILE_DIR:cru_toml_test>
+	COMMAND_EXPAND_LISTS
+	)
+endif()
+
 gtest_discover_tests(cru_toml_test)
diff --git a/test/win/graphics/direct/CMakeLists.txt b/test/win/graphics/direct/CMakeLists.txt
index 69e22ef7..c68f14c5 100644
--- a/test/win/graphics/direct/CMakeLists.txt
+++ b/test/win/graphics/direct/CMakeLists.txt
@@ -3,4 +3,11 @@ add_executable(cru_win_graphics_direct_test
 )
 target_link_libraries(cru_win_graphics_direct_test PRIVATE cru_win_graphics_direct cru_test_base)
 
+if (WIN32)
+	add_custom_command(TARGET cru_win_graphics_direct_test POST_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:cru_win_graphics_direct_test> $<TARGET_FILE_DIR:cru_win_graphics_direct_test>
+	COMMAND_EXPAND_LISTS
+	)
+endif()
+
 gtest_discover_tests(cru_win_graphics_direct_test)
diff --git a/test/xml/CMakeLists.txt b/test/xml/CMakeLists.txt
index a8dfa264..d6ce4447 100644
--- a/test/xml/CMakeLists.txt
+++ b/test/xml/CMakeLists.txt
@@ -3,4 +3,11 @@ add_executable(cru_xml_test
 )
 target_link_libraries(cru_xml_test PRIVATE cru_xml cru_test_base)
 
+if (WIN32)
+	add_custom_command(TARGET cru_xml_test POST_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:cru_xml_test> $<TARGET_FILE_DIR:cru_xml_test>
+	COMMAND_EXPAND_LISTS
+	)
+endif()
+
 gtest_discover_tests(cru_xml_test)