diff options
-rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
-rw-r--r-- | test/common/CMakeLists.txt | 10 | ||||
-rw-r--r-- | test/platform/CMakeLists.txt | 10 | ||||
-rw-r--r-- | test/toml/CMakeLists.txt | 10 | ||||
-rw-r--r-- | test/win/graphics/direct/CMakeLists.txt | 10 | ||||
-rw-r--r-- | test/xml/CMakeLists.txt | 10 |
6 files changed, 32 insertions, 22 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a9c7ac7..676531a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Build run: | - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -H. -Bbuild -G Ninja + 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 @@ -61,7 +61,7 @@ jobs: - name: Build run: | - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -H. -Bbuild -G Ninja + 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 diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt index f0406db8..7926437c 100644 --- a/test/common/CMakeLists.txt +++ b/test/common/CMakeLists.txt @@ -12,9 +12,11 @@ if (UNIX) ) endif() -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 - ) +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 57cdec03..5feec2d1 100644 --- a/test/platform/CMakeLists.txt +++ b/test/platform/CMakeLists.txt @@ -4,9 +4,11 @@ add_executable(cru_platform_base_test ) target_link_libraries(cru_platform_base_test PRIVATE cru_platform_base cru_test_base) -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 - ) +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 85ca7329..98270d30 100644 --- a/test/toml/CMakeLists.txt +++ b/test/toml/CMakeLists.txt @@ -3,9 +3,11 @@ add_executable(cru_toml_test ) target_link_libraries(cru_toml_test PRIVATE cru_toml cru_test_base) -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 - ) +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 c641ff38..c68f14c5 100644 --- a/test/win/graphics/direct/CMakeLists.txt +++ b/test/win/graphics/direct/CMakeLists.txt @@ -3,9 +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) -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 - ) +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 7f6341ab..d6ce4447 100644 --- a/test/xml/CMakeLists.txt +++ b/test/xml/CMakeLists.txt @@ -3,9 +3,11 @@ add_executable(cru_xml_test ) target_link_libraries(cru_xml_test PRIVATE cru_xml cru_test_base) -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 - ) +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) |