From 57ba809076781b71e71be379e9a0a09ebcb9dd4b Mon Sep 17 00:00:00 2001 From: Orange Date: Sun, 30 Nov 2025 01:32:25 +0300 Subject: [PATCH] Auto stash before merge of "main" and "origin/main" --- CMakePresets.json | 2 +- examples/CMakeLists.txt | 21 ++++++++++++++++++--- examples/example_glfw3.cpp | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 3c23526..d9f232d 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -25,7 +25,7 @@ "OMATH_BUILD_VIA_VCPKG": "ON", "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", "VCPKG_INSTALLED_DIR": "${sourceDir}/cmake-build/vcpkg_installed", - "VCPKG_MANIFEST_FEATURES": "tests;imgui;avx2" + "VCPKG_MANIFEST_FEATURES": "tests;imgui;avx2;examples" } }, { diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index d1a59b7..2f922c6 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,16 +1,31 @@ project(examples) add_executable(example_projection_matrix_builder example_proj_mat_builder.cpp) -set_target_properties(example_projection_matrix_builder PROPERTIES CXX_STANDARD 26) +set_target_properties(example_projection_matrix_builder PROPERTIES + CXX_STANDARD 26 + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}" +) target_link_libraries(example_projection_matrix_builder PRIVATE omath::omath) add_executable(example_signature_scan example_signature_scan.cpp) -set_target_properties(example_signature_scan PROPERTIES CXX_STANDARD 26) +set_target_properties(example_signature_scan PROPERTIES + CXX_STANDARD 26 + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}" +) target_link_libraries(example_signature_scan PRIVATE omath::omath) add_executable(example_glfw3 example_glfw3.cpp) -set_target_properties(example_glfw3 PROPERTIES CXX_STANDARD 26) +set_target_properties(example_glfw3 PROPERTIES CXX_STANDARD 26 + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}" + + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}" +) find_package(GLEW REQUIRED) find_package(glfw3 CONFIG REQUIRED) diff --git a/examples/example_glfw3.cpp b/examples/example_glfw3.cpp index b7598bf..4ab06b3 100644 --- a/examples/example_glfw3.cpp +++ b/examples/example_glfw3.cpp @@ -222,7 +222,7 @@ int main() CubeMesh cube{std::move(vbo), std::move(ebo)}; cube.set_origin({0.f, 0.f, 0.f}); - cube.set_scale({1.f, 2.f, 1.f}); + cube.set_scale({2.f, 2.f, 2.f}); cube.set_rotation(RotationAngles{}); // ---------- OpenGL buffers ----------