From 09fd98e2f33ec80c903c126cf214e2175ca08428 Mon Sep 17 00:00:00 2001 From: Tobias Frisch <tfrisch@uni-koblenz.de> Date: Fri, 25 Jun 2021 22:27:03 +0200 Subject: [PATCH] Fixed the axis of space Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de> --- modules/camera/CMakeLists.txt | 2 +- modules/camera/config/GLM.cmake | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/camera/CMakeLists.txt b/modules/camera/CMakeLists.txt index 8fa7a924..60cfca4c 100644 --- a/modules/camera/CMakeLists.txt +++ b/modules/camera/CMakeLists.txt @@ -36,4 +36,4 @@ target_include_directories(vkcv_camera SYSTEM BEFORE PRIVATE ${vkcv_camera_inclu # add the own include directory for public headers target_include_directories(vkcv_camera BEFORE PUBLIC ${vkcv_camera_include} ${vkcv_camera_includes}) -target_compile_definitions(vkcv_camera PUBLIC ${vkcv_camera_defines}) +target_compile_definitions(vkcv_camera PUBLIC ${vkcv_camera_definitions}) diff --git a/modules/camera/config/GLM.cmake b/modules/camera/config/GLM.cmake index 6f6e0f65..efd64444 100644 --- a/modules/camera/config/GLM.cmake +++ b/modules/camera/config/GLM.cmake @@ -4,14 +4,17 @@ find_package(glm QUIET) if (glm_FOUND) list(APPEND vkcv_camera_includes ${GLM_INCLUDE_DIRS}) list(APPEND vkcv_camera_libraries glm) + + list(APPEND vkcv_camera_definitions GLM_DEPTH_ZERO_TO_ONE) + list(APPEND vkcv_camera_definitions GLM_FORCE_LEFT_HANDED) else() if (EXISTS "${vkcv_camera_lib_path}/glm") add_subdirectory(${vkcv_camera_lib}/glm) list(APPEND vkcv_camera_libraries glm) - list(APPEND vkcv_camera_defines GLM_DEPTH_ZERO_TO_ONE) - list(APPEND vkcv_camera_defines GLM_FORCE_LEFT_HANDED) + list(APPEND vkcv_camera_definitions GLM_DEPTH_ZERO_TO_ONE) + list(APPEND vkcv_camera_definitions GLM_FORCE_LEFT_HANDED) else() message(WARNING "GLM is required..! Update the submodules!") endif () -- GitLab