From 673835618c35091e61a2948eb6683890ee13afce Mon Sep 17 00:00:00 2001 From: Orange Date: Tue, 10 Mar 2026 15:57:22 +0300 Subject: [PATCH] restructurized stuff --- .github/workflows/cmake-multi-platform.yml | 20 +++++++++---------- CMakePresets.json | 2 +- tests/CMakeLists.txt | 9 +++++++-- .../{general => lua}/unit_test_lua_color.cpp | 0 .../unit_test_lua_source_engine.cpp | 0 .../unit_test_lua_vector2.cpp | 0 .../unit_test_lua_vector3.cpp | 0 .../unit_test_lua_vector4.cpp | 0 8 files changed, 18 insertions(+), 13 deletions(-) rename tests/{general => lua}/unit_test_lua_color.cpp (100%) rename tests/{general => lua}/unit_test_lua_source_engine.cpp (100%) rename tests/{general => lua}/unit_test_lua_vector2.cpp (100%) rename tests/{general => lua}/unit_test_lua_vector3.cpp (100%) rename tests/{general => lua}/unit_test_lua_vector4.cpp (100%) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 2c6b985..a33fe07 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -107,7 +107,7 @@ jobs: -DOMATH_BUILD_TESTS=ON \ -DOMATH_BUILD_BENCHMARK=OFF \ -DOMATH_ENABLE_COVERAGE=${{ matrix.coverage == true && 'ON' || 'OFF' }} \ - -DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests" + -DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests;lua" - name: Build shell: bash @@ -193,7 +193,7 @@ jobs: -DOMATH_BUILD_TESTS=ON \ -DOMATH_BUILD_BENCHMARK=OFF \ -DOMATH_ENABLE_COVERAGE=OFF \ - -DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests" + -DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests;lua" - name: Build shell: bash @@ -234,7 +234,7 @@ jobs: -DOMATH_ENABLE_COVERAGE=ON \ -DOMATH_THREAT_WARNING_AS_ERROR=OFF \ -DCMAKE_BUILD_TYPE=Debug \ - -DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests" + -DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests;lua" cmake --build cmake-build/build/${{ matrix.preset }} --config Debug --target unit_tests omath - name: Run Tests (Generates .profraw) @@ -373,7 +373,7 @@ jobs: -DOMATH_BUILD_TESTS=ON \ -DOMATH_BUILD_BENCHMARK=OFF \ -DOMATH_ENABLE_COVERAGE=${{ matrix.coverage == true && 'ON' || 'OFF' }} \ - -DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests" + -DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests;lua" - name: Build shell: bash @@ -450,7 +450,7 @@ jobs: -DVCPKG_INSTALL_OPTIONS="--allow-unsupported" \ -DOMATH_BUILD_TESTS=ON \ -DOMATH_BUILD_BENCHMARK=OFF \ - -DVCPKG_MANIFEST_FEATURES="imgui;tests" + -DVCPKG_MANIFEST_FEATURES="imgui;tests;lua" - name: Build shell: bash @@ -509,7 +509,7 @@ jobs: cmake --preset ${{ matrix.preset }} \ -DOMATH_BUILD_TESTS=ON \ -DOMATH_BUILD_BENCHMARK=OFF \ - -DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests" \ + -DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests;lua" \ -DVCPKG_INSTALL_OPTIONS="--allow-unsupported" cmake --build cmake-build/build/${{ matrix.preset }} --target unit_tests omath ./out/Release/unit_tests @@ -581,7 +581,7 @@ jobs: -DVCPKG_INSTALL_OPTIONS="--allow-unsupported" \ -DOMATH_BUILD_TESTS=ON \ -DOMATH_BUILD_BENCHMARK=OFF \ - -DVCPKG_MANIFEST_FEATURES="imgui;tests" + -DVCPKG_MANIFEST_FEATURES="imgui;tests;lua" - name: Build shell: bash @@ -650,7 +650,7 @@ jobs: -DVCPKG_INSTALL_OPTIONS="--allow-unsupported" \ -DOMATH_BUILD_TESTS=ON \ -DOMATH_BUILD_BENCHMARK=OFF \ - -DVCPKG_MANIFEST_FEATURES="imgui;tests" + -DVCPKG_MANIFEST_FEATURES="imgui;tests;lua" - name: Build shell: bash @@ -735,7 +735,7 @@ jobs: -DVCPKG_INSTALL_OPTIONS="--allow-unsupported" \ -DOMATH_BUILD_TESTS=ON \ -DOMATH_BUILD_BENCHMARK=OFF \ - -DVCPKG_MANIFEST_FEATURES="imgui;tests" + -DVCPKG_MANIFEST_FEATURES="imgui;tests;lua" - name: Build run: | @@ -800,7 +800,7 @@ jobs: -DOMATH_BUILD_TESTS=ON \ -DOMATH_BUILD_BENCHMARK=ON \ -DOMATH_ENABLE_VALGRIND=ON \ - -DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests;benchmark" + -DVCPKG_MANIFEST_FEATURES="imgui;avx2;lua;tests;benchmark" - name: Build All Targets shell: bash diff --git a/CMakePresets.json b/CMakePresets.json index e2097f0..8d27ee1 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -235,7 +235,7 @@ "hidden": true, "inherits": ["darwin-base", "vcpkg-base"], "cacheVariables": { - "VCPKG_MANIFEST_FEATURES": "tests;imgui;avx2;examples" + "VCPKG_MANIFEST_FEATURES": "tests;imgui;avx2;examples;lua" } }, { diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e18b2ba..d84a581 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -4,7 +4,7 @@ project(unit_tests) include(GoogleTest) -file(GLOB_RECURSE UNIT_TESTS_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp") +file(GLOB_RECURSE UNIT_TESTS_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/general/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/engines/*.cpp") add_executable(${PROJECT_NAME} ${UNIT_TESTS_SOURCES}) set_target_properties( @@ -22,7 +22,11 @@ else() # GTest is being linked as vcpkg package target_link_libraries(${PROJECT_NAME} PRIVATE GTest::gtest GTest::gtest_main omath::omath) endif() -target_compile_definitions(${PROJECT_NAME} PRIVATE LUA_SCRIPTS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/lua") +if (OMATH_ENABLE_LUA) + file(GLOB_RECURSE UNIT_TESTS_SOURCES_LUA CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/lua/*.cpp") + target_compile_definitions(${PROJECT_NAME} PRIVATE LUA_SCRIPTS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/lua") + target_sources(${PROJECT_NAME} PRIVATE ${UNIT_TESTS_SOURCES_LUA}) +endif() if(OMATH_ENABLE_COVERAGE) include(${CMAKE_SOURCE_DIR}/cmake/Coverage.cmake) @@ -38,3 +42,4 @@ endif() if(NOT (ANDROID OR IOS OR EMSCRIPTEN)) gtest_discover_tests(${PROJECT_NAME}) endif() + diff --git a/tests/general/unit_test_lua_color.cpp b/tests/lua/unit_test_lua_color.cpp similarity index 100% rename from tests/general/unit_test_lua_color.cpp rename to tests/lua/unit_test_lua_color.cpp diff --git a/tests/general/unit_test_lua_source_engine.cpp b/tests/lua/unit_test_lua_source_engine.cpp similarity index 100% rename from tests/general/unit_test_lua_source_engine.cpp rename to tests/lua/unit_test_lua_source_engine.cpp diff --git a/tests/general/unit_test_lua_vector2.cpp b/tests/lua/unit_test_lua_vector2.cpp similarity index 100% rename from tests/general/unit_test_lua_vector2.cpp rename to tests/lua/unit_test_lua_vector2.cpp diff --git a/tests/general/unit_test_lua_vector3.cpp b/tests/lua/unit_test_lua_vector3.cpp similarity index 100% rename from tests/general/unit_test_lua_vector3.cpp rename to tests/lua/unit_test_lua_vector3.cpp diff --git a/tests/general/unit_test_lua_vector4.cpp b/tests/lua/unit_test_lua_vector4.cpp similarity index 100% rename from tests/general/unit_test_lua_vector4.cpp rename to tests/lua/unit_test_lua_vector4.cpp