From c84586d6e01085027f2d8e9324a82ddabb708db2 Mon Sep 17 00:00:00 2001
From: Sebastian Gaida <gaida@ca-digit.com>
Date: Tue, 20 Jul 2021 12:41:36 +0200
Subject: [PATCH] [#87][Fix] include of glm submodule in meshlet module
---
modules/meshlet/CMakeLists.txt | 5 +---
modules/meshlet/config/GLM.cmake | 23 -------------------
.../meshlet/include/vkcv/meshlet/Meshlet.hpp | 1 +
modules/meshlet/src/vkcv/meshlet/Meshlet.cpp | 1 -
projects/mesh_shader/src/main.cpp | 2 +-
5 files changed, 3 insertions(+), 29 deletions(-)
delete mode 100644 modules/meshlet/config/GLM.cmake
diff --git a/modules/meshlet/CMakeLists.txt b/modules/meshlet/CMakeLists.txt
index d85b4602..8c682387 100644
--- a/modules/meshlet/CMakeLists.txt
+++ b/modules/meshlet/CMakeLists.txt
@@ -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)
diff --git a/modules/meshlet/config/GLM.cmake b/modules/meshlet/config/GLM.cmake
deleted file mode 100644
index 50793345..00000000
--- a/modules/meshlet/config/GLM.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-
-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()
diff --git a/modules/meshlet/include/vkcv/meshlet/Meshlet.hpp b/modules/meshlet/include/vkcv/meshlet/Meshlet.hpp
index 44761802..498257c1 100644
--- a/modules/meshlet/include/vkcv/meshlet/Meshlet.hpp
+++ b/modules/meshlet/include/vkcv/meshlet/Meshlet.hpp
@@ -3,6 +3,7 @@
#include <vector>
#include <map>
#include <glm/glm.hpp>
+#include <vkcv/asset/asset_loader.hpp>
namespace vkcv::meshlet {
diff --git a/modules/meshlet/src/vkcv/meshlet/Meshlet.cpp b/modules/meshlet/src/vkcv/meshlet/Meshlet.cpp
index 542dcf7d..02bfa9d8 100644
--- a/modules/meshlet/src/vkcv/meshlet/Meshlet.cpp
+++ b/modules/meshlet/src/vkcv/meshlet/Meshlet.cpp
@@ -1,6 +1,5 @@
#include "vkcv/meshlet/Meshlet.hpp"
-#include <vkcv/asset/asset_loader.hpp>
#include <vkcv/Logger.hpp>
#include <cassert>
diff --git a/projects/mesh_shader/src/main.cpp b/projects/mesh_shader/src/main.cpp
index 40ae9ce2..5d906723 100644
--- a/projects/mesh_shader/src/main.cpp
+++ b/projects/mesh_shader/src/main.cpp
@@ -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";
--
GitLab