Skip to content

Commit 57ba809

Browse files
committed
Auto stash before merge of "main" and "origin/main"
1 parent 6fd3a69 commit 57ba809

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"OMATH_BUILD_VIA_VCPKG": "ON",
2626
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
2727
"VCPKG_INSTALLED_DIR": "${sourceDir}/cmake-build/vcpkg_installed",
28-
"VCPKG_MANIFEST_FEATURES": "tests;imgui;avx2"
28+
"VCPKG_MANIFEST_FEATURES": "tests;imgui;avx2;examples"
2929
}
3030
},
3131
{

examples/CMakeLists.txt

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
11
project(examples)
22

33
add_executable(example_projection_matrix_builder example_proj_mat_builder.cpp)
4-
set_target_properties(example_projection_matrix_builder PROPERTIES CXX_STANDARD 26)
4+
set_target_properties(example_projection_matrix_builder PROPERTIES
5+
CXX_STANDARD 26
6+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
7+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
8+
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
9+
)
510
target_link_libraries(example_projection_matrix_builder PRIVATE omath::omath)
611

712
add_executable(example_signature_scan example_signature_scan.cpp)
8-
set_target_properties(example_signature_scan PROPERTIES CXX_STANDARD 26)
13+
set_target_properties(example_signature_scan PROPERTIES
14+
CXX_STANDARD 26
15+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
16+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
17+
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
18+
)
919
target_link_libraries(example_signature_scan PRIVATE omath::omath)
1020

1121

1222
add_executable(example_glfw3 example_glfw3.cpp)
13-
set_target_properties(example_glfw3 PROPERTIES CXX_STANDARD 26)
23+
set_target_properties(example_glfw3 PROPERTIES CXX_STANDARD 26
24+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
25+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
26+
27+
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
28+
)
1429

1530
find_package(GLEW REQUIRED)
1631
find_package(glfw3 CONFIG REQUIRED)

examples/example_glfw3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ int main()
222222

223223
CubeMesh cube{std::move(vbo), std::move(ebo)};
224224
cube.set_origin({0.f, 0.f, 0.f});
225-
cube.set_scale({1.f, 2.f, 1.f});
225+
cube.set_scale({2.f, 2.f, 2.f});
226226
cube.set_rotation(RotationAngles{});
227227

228228
// ---------- OpenGL buffers ----------

0 commit comments

Comments
 (0)