From 7958493418648f312ebe331a39299f0451d6b265 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Tue, 13 Jul 2021 12:35:41 +0200
Subject: [PATCH] [#93] Fix for 32bit Windows build and GLM
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
modules/camera/config/GLM.cmake | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/modules/camera/config/GLM.cmake b/modules/camera/config/GLM.cmake
index efd64444..f256ccad 100644
--- a/modules/camera/config/GLM.cmake
+++ b/modules/camera/config/GLM.cmake
@@ -4,18 +4,20 @@ 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_includes ${vkcv_camera_lib_path}/glm)
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()
message(WARNING "GLM is required..! Update the submodules!")
endif ()
endif ()
+
+list(APPEND vkcv_camera_definitions GLM_DEPTH_ZERO_TO_ONE)
+list(APPEND vkcv_camera_definitions GLM_FORCE_LEFT_HANDED)
+
+if ((WIN32) AND (${CMAKE_SIZEOF_VOID_P} MATCHES 4))
+ list(APPEND vkcv_camera_definitions GLM_ENABLE_EXPERIMENTAL)
+endif()
--
GitLab