From e9504e1d1ced84ccf5afb6c967dc95f7c1e4f0db Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 19 Jan 2022 15:18:08 +0800 Subject: ... --- CMakeLists.txt | 5 +---- test/common/CMakeLists.txt | 5 +++++ test/platform/CMakeLists.txt | 5 +++++ test/toml/CMakeLists.txt | 5 +++++ test/win/graphics/direct/CMakeLists.txt | 5 +++++ test/xml/CMakeLists.txt | 5 +++++ 6 files changed, 26 insertions(+), 4 deletions(-) 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..f0406db8 100644 --- a/test/common/CMakeLists.txt +++ b/test/common/CMakeLists.txt @@ -12,4 +12,9 @@ if (UNIX) ) endif() +add_custom_command(TARGET cru_base_test POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ $ + COMMAND_EXPAND_LISTS + ) + gtest_discover_tests(cru_base_test) diff --git a/test/platform/CMakeLists.txt b/test/platform/CMakeLists.txt index 9414e2b8..57cdec03 100644 --- a/test/platform/CMakeLists.txt +++ b/test/platform/CMakeLists.txt @@ -4,4 +4,9 @@ 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 $ $ + COMMAND_EXPAND_LISTS + ) + gtest_discover_tests(cru_platform_base_test) diff --git a/test/toml/CMakeLists.txt b/test/toml/CMakeLists.txt index 22766ecd..85ca7329 100644 --- a/test/toml/CMakeLists.txt +++ b/test/toml/CMakeLists.txt @@ -3,4 +3,9 @@ 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 $ $ + COMMAND_EXPAND_LISTS + ) + gtest_discover_tests(cru_toml_test) diff --git a/test/win/graphics/direct/CMakeLists.txt b/test/win/graphics/direct/CMakeLists.txt index 69e22ef7..c641ff38 100644 --- a/test/win/graphics/direct/CMakeLists.txt +++ b/test/win/graphics/direct/CMakeLists.txt @@ -3,4 +3,9 @@ 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 $ $ + COMMAND_EXPAND_LISTS + ) + gtest_discover_tests(cru_win_graphics_direct_test) diff --git a/test/xml/CMakeLists.txt b/test/xml/CMakeLists.txt index a8dfa264..7f6341ab 100644 --- a/test/xml/CMakeLists.txt +++ b/test/xml/CMakeLists.txt @@ -3,4 +3,9 @@ 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 $ $ + COMMAND_EXPAND_LISTS + ) + gtest_discover_tests(cru_xml_test) -- cgit v1.2.3 From 6f7d98a277f468fceb0585f9c4f4b3b6b64f5f3a Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 19 Jan 2022 15:21:06 +0800 Subject: ... --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e99fc8b6..7a9c7ac7 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++ -H. -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++ -H. -Bbuild -G Ninja + cmake --build build --config Debug --target all - name: Test working-directory: build -- cgit v1.2.3 From 3573964d75068e25d7082abf1561bef975303d7d Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 19 Jan 2022 15:28:12 +0800 Subject: ... --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a9c7ac7..efc6db3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,6 +61,7 @@ jobs: - name: Build run: | + mkdir build cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -H. -Bbuild -G Ninja cmake --build build --config Debug --target all -- cgit v1.2.3 From 9c2974536f1728c839912eaeb287a4bbdcaa5a8a Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 19 Jan 2022 16:45:15 +0800 Subject: ... --- .github/workflows/ci.yml | 4 ++-- test/common/CMakeLists.txt | 10 ++++++---- test/platform/CMakeLists.txt | 10 ++++++---- test/toml/CMakeLists.txt | 10 ++++++---- test/win/graphics/direct/CMakeLists.txt | 10 ++++++---- 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 $ $ - COMMAND_EXPAND_LISTS - ) +if (WIN32) + add_custom_command(TARGET cru_base_test POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ $ + 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 $ $ - COMMAND_EXPAND_LISTS - ) +if (WIN32) + add_custom_command(TARGET cru_platform_base_test POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ $ + 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 $ $ - COMMAND_EXPAND_LISTS - ) +if (WIN32) + add_custom_command(TARGET cru_toml_test POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ $ + 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 $ $ - COMMAND_EXPAND_LISTS - ) +if (WIN32) + add_custom_command(TARGET cru_win_graphics_direct_test POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ $ + 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 $ $ - COMMAND_EXPAND_LISTS - ) +if (WIN32) + add_custom_command(TARGET cru_xml_test POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ $ + COMMAND_EXPAND_LISTS + ) +endif() gtest_discover_tests(cru_xml_test) -- cgit v1.2.3