Skip to content
Snippets Groups Projects
Verified Commit 7d5b1784 authored by Tobias Frisch's avatar Tobias Frisch
Browse files

[#85] Adding defines to save the day in cmake

parent 09bd9f22
No related branches found
No related tags found
1 merge request!73Resolve "MinGW - the messy compiler support"
Pipeline #26053 failed
...@@ -10,6 +10,8 @@ if(NOT WIN32) ...@@ -10,6 +10,8 @@ if(NOT WIN32)
list(APPEND vkcv_flags -fopenmp) list(APPEND vkcv_flags -fopenmp)
endif() endif()
list(APPEND vkcv_definitions _USE_MATH_DEFINES)
# some formatted printing # some formatted printing
set(vkcv_config_msg " - Library: ") set(vkcv_config_msg " - Library: ")
......
...@@ -36,3 +36,4 @@ target_include_directories(vkcv_camera SYSTEM BEFORE PRIVATE ${vkcv_camera_inclu ...@@ -36,3 +36,4 @@ target_include_directories(vkcv_camera SYSTEM BEFORE PRIVATE ${vkcv_camera_inclu
# add the own include directory for public headers # add the own include directory for public headers
target_include_directories(vkcv_camera BEFORE PUBLIC ${vkcv_camera_include} ${vkcv_camera_includes}) target_include_directories(vkcv_camera BEFORE PUBLIC ${vkcv_camera_include} ${vkcv_camera_includes})
target_compile_definitions(vkcv_camera PUBLIC ${vkcv_camera_defines})
...@@ -9,6 +9,9 @@ else() ...@@ -9,6 +9,9 @@ else()
add_subdirectory(${vkcv_camera_lib}/glm) add_subdirectory(${vkcv_camera_lib}/glm)
list(APPEND vkcv_camera_libraries glm) list(APPEND vkcv_camera_libraries glm)
list(APPEND vkcv_camera_defines GLM_DEPTH_ZERO_TO_ONE=1)
list(APPEND vkcv_camera_defines GLM_FORCE_LEFT_HANDED=1)
else() else()
message(WARNING "GLM is required..! Update the submodules!") message(WARNING "GLM is required..! Update the submodules!")
endif () endif ()
......
#pragma once #pragma once
#define GLM_DEPTH_ZERO_TO_ONE
#define GLM_FORCE_LEFT_HANDED
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/matrix_access.hpp> #include <glm/gtc/matrix_access.hpp>
......
#include "vkcv/camera/Camera.hpp" #include "vkcv/camera/Camera.hpp"
#define _USE_MATH_DEFINES
#include <math.h> #include <math.h>
namespace vkcv::camera { namespace vkcv::camera {
......
...@@ -32,3 +32,5 @@ target_include_directories(vkcv_gui SYSTEM BEFORE PRIVATE ${vkcv_gui_includes} $ ...@@ -32,3 +32,5 @@ target_include_directories(vkcv_gui SYSTEM BEFORE PRIVATE ${vkcv_gui_includes} $
# add the own include directory for public headers # add the own include directory for public headers
target_include_directories(vkcv_gui BEFORE PUBLIC ${vkcv_gui_include} ${vkcv_imgui_includes}) target_include_directories(vkcv_gui BEFORE PUBLIC ${vkcv_gui_include} ${vkcv_imgui_includes})
target_compile_definitions(vkcv_gui PUBLIC ${vkcv_gui_defines})
...@@ -20,6 +20,8 @@ if (EXISTS "${vkcv_gui_lib_path}/imgui") ...@@ -20,6 +20,8 @@ if (EXISTS "${vkcv_gui_lib_path}/imgui")
list(APPEND vkcv_imgui_includes ${vkcv_gui_lib}/imgui/backend) list(APPEND vkcv_imgui_includes ${vkcv_gui_lib}/imgui/backend)
list(APPEND vkcv_gui_include ${vkcv_gui_lib}) list(APPEND vkcv_gui_include ${vkcv_gui_lib})
list(APPEND vkcv_gui_defines IMGUI_DISABLE_WIN32_FUNCTIONS=1)
else() else()
message(WARNING "IMGUI is required..! Update the submodules!") message(WARNING "IMGUI is required..! Update the submodules!")
endif () endif ()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment