From b46aaaf57a3e4b13eac12bf528034ba75373bdc3 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Fri, 28 May 2021 09:41:41 +0200
Subject: [PATCH] [#26] Adjusted cmake files to match other modules in
structure
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
modules/asset_loader/CMakeLists.txt | 28 ++++---------------
modules/asset_loader/config/FX_GLTF.cmake | 12 ++++++++
.../asset_loader/config/NLOHMANN_JSON.cmake | 10 +++++++
3 files changed, 27 insertions(+), 23 deletions(-)
create mode 100644 modules/asset_loader/config/FX_GLTF.cmake
create mode 100644 modules/asset_loader/config/NLOHMANN_JSON.cmake
diff --git a/modules/asset_loader/CMakeLists.txt b/modules/asset_loader/CMakeLists.txt
index 51cdcf12..6246de8a 100644
--- a/modules/asset_loader/CMakeLists.txt
+++ b/modules/asset_loader/CMakeLists.txt
@@ -14,36 +14,18 @@ set(vkcv_asset_loader_sources
${vkcv_asset_loader_source}/vkcv/asset/asset_loader.cpp
)
+# adding source files to the module
+add_library(vkcv_asset_loader STATIC ${vkcv_asset_loader_sources})
+
# Setup some path variables to load libraries
set(vkcv_asset_loader_lib lib)
set(vkcv_asset_loader_lib_path ${PROJECT_SOURCE_DIR}/${vkcv_asset_loader_lib})
# Check and load NLOHMANN_JSON
-if (EXISTS "${vkcv_asset_loader_lib_path}/json")
- set(JSON_BuildTests OFF CACHE INTERNAL "")
-
- add_subdirectory(${vkcv_asset_loader_lib}/json)
-
- list(APPEND vkcv_asset_loader_libraries nlohmann_json::nlohmann_json)
-else()
- message(WARNING "NLOHMANN_JSON is required..! Update the submodules!")
-endif ()
+include(config/NLOHMANN_JSON.cmake)
# Check and load FX-GLTF
-if (EXISTS "${vkcv_asset_loader_lib_path}/fx-gltf")
- set(FX_GLTF_INSTALL OFF CACHE INTERNAL "")
- set(FX_GLTF_USE_INSTALLED_DEPS OFF CACHE INTERNAL "")
- set(BUILD_TESTING OFF CACHE INTERNAL "")
-
- add_subdirectory(${vkcv_asset_loader_lib}/fx-gltf)
-
- list(APPEND vkcv_asset_loader_libraries fx-gltf)
-else()
- message(WARNING "FX-GLTF is required..! Update the submodules!")
-endif ()
-
-# adding source files to the module
-add_library(vkcv_asset_loader STATIC ${vkcv_asset_loader_sources})
+include(config/FX_GLTF.cmake)
# link the required libraries to the module
target_link_libraries(vkcv_asset_loader ${vkcv_asset_loader_libraries})
diff --git a/modules/asset_loader/config/FX_GLTF.cmake b/modules/asset_loader/config/FX_GLTF.cmake
new file mode 100644
index 00000000..37cd1624
--- /dev/null
+++ b/modules/asset_loader/config/FX_GLTF.cmake
@@ -0,0 +1,12 @@
+
+if (EXISTS "${vkcv_asset_loader_lib_path}/fx-gltf")
+ set(FX_GLTF_INSTALL OFF CACHE INTERNAL "")
+ set(FX_GLTF_USE_INSTALLED_DEPS OFF CACHE INTERNAL "")
+ set(BUILD_TESTING OFF CACHE INTERNAL "")
+
+ add_subdirectory(${vkcv_asset_loader_lib}/fx-gltf)
+
+ list(APPEND vkcv_asset_loader_libraries fx-gltf)
+else()
+ message(WARNING "FX-GLTF is required..! Update the submodules!")
+endif ()
diff --git a/modules/asset_loader/config/NLOHMANN_JSON.cmake b/modules/asset_loader/config/NLOHMANN_JSON.cmake
new file mode 100644
index 00000000..018f6a19
--- /dev/null
+++ b/modules/asset_loader/config/NLOHMANN_JSON.cmake
@@ -0,0 +1,10 @@
+
+if (EXISTS "${vkcv_asset_loader_lib_path}/json")
+ set(JSON_BuildTests OFF CACHE INTERNAL "")
+
+ add_subdirectory(${vkcv_asset_loader_lib}/json)
+
+ list(APPEND vkcv_asset_loader_libraries nlohmann_json::nlohmann_json)
+else()
+ message(WARNING "NLOHMANN_JSON is required..! Update the submodules!")
+endif ()
--
GitLab