Skip to content
Snippets Groups Projects
Commit c84586d6 authored by Sebastian Gaida's avatar Sebastian Gaida
Browse files

[#87][Fix] include of glm submodule in meshlet module

parent 8048598a
No related branches found
No related tags found
1 merge request!74Resolve "Mesh Shader Implementation"
Pipeline #26470 passed
......@@ -19,9 +19,6 @@ set(vkcv_meshlet_sources
# adding source files to the module
add_library(vkcv_meshlet STATIC ${vkcv_meshlet_sources})
# Setup some path variables to load libraries
set(vkcv_meshlet_lib lib)
set(vkcv_meshlet_lib_path ${PROJECT_SOURCE_DIR}/${vkcv_meshlet_lib})
# link the required libraries to the module
target_link_libraries(vkcv_meshlet vkcv ${vkcv_libraries})
......@@ -33,4 +30,4 @@ target_include_directories(vkcv_meshlet SYSTEM BEFORE PRIVATE ${vkcv_include} ${
target_include_directories(vkcv_meshlet BEFORE PUBLIC ${vkcv_meshlet_include})
# linking with libraries from all dependencies and the VkCV framework
target_link_libraries(vkcv_meshlet vkcv vkcv_asset_loader)
target_link_libraries(vkcv_meshlet vkcv vkcv_asset_loader vkcv_camera)
find_package(glm QUIET)
if (glm_FOUND)
list(APPEND vkcv_meshlet_includes ${GLM_INCLUDE_DIRS})
list(APPEND vkcv_meshlet_libraries glm)
else()
if (EXISTS "${vkcv_meshlet_lib_path}/glm")
add_subdirectory(${vkcv_meshlet_lib}/glm)
list(APPEND vkcv_meshlet_includes ${vkcv_meshlet_lib_path}/glm)
list(APPEND vkcv_meshlet_libraries glm)
else()
message(WARNING "GLM is required..! Update the submodules!")
endif ()
endif ()
list(APPEND vkcv_meshlet_definitions GLM_DEPTH_ZERO_TO_ONE)
list(APPEND vkcv_meshlet_definitions GLM_FORCE_LEFT_HANDED)
if ((WIN32) AND (${CMAKE_SIZEOF_VOID_P} MATCHES 4))
list(APPEND vkcv_meshlet_definitions GLM_ENABLE_EXPERIMENTAL)
endif()
......@@ -3,6 +3,7 @@
#include <vector>
#include <map>
#include <glm/glm.hpp>
#include <vkcv/asset/asset_loader.hpp>
namespace vkcv::meshlet {
......
#include "vkcv/meshlet/Meshlet.hpp"
#include <vkcv/asset/asset_loader.hpp>
#include <vkcv/Logger.hpp>
#include <cassert>
......
......@@ -8,7 +8,7 @@
#include <vkcv/gui/GUI.hpp>
#include <vkcv/asset/asset_loader.hpp>
#include <vkcv/meshlet/Meshlet.hpp>
#include <vkcv/meshlet/Tipsify.hpp>
//#include <vkcv/meshlet/Tipsify.hpp>
int main(int argc, const char** argv) {
const char* applicationName = "Mesh shader";
......
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