summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVittorio Romeo <vittorio.romeo@outlook.com>2022-09-24 22:32:36 -0400
committerVittorio Romeo <vittorio.romeo@outlook.com>2022-09-24 22:32:36 -0400
commitf1688f37285a835a803a83fd063982503988b7b2 (patch)
tree25d4287d07823b9997607ebc4755dd719a5ec02b
parent421598bc58030841d7277d89a889514e1d6050b2 (diff)
Don't compile ArgExtractor with metadata disabledv2.1.6
-rw-r--r--CMakeLists.txt4
-rw-r--r--include/SSVOpenHexagon/Utils/LuaMetadataProxy.hpp3
2 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 459a3e55..578f6d94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ endif()
# CPM
# -----------------------------------------------------------------------------
-set(CPM_DOWNLOAD_VERSION 0.34.0)
+set(CPM_DOWNLOAD_VERSION 0.35.6)
if(CPM_SOURCE_CACHE)
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
@@ -95,7 +95,7 @@ set(SFML_STATIC_LIBRARIES false)
CPMAddPackage(
NAME SFML
GITHUB_REPOSITORY vittorioromeo/SFML
- GIT_TAG fd3526f74287dd9824d565d50363ca950f05d789
+ GIT_TAG c565daccaef9c277aa97b17d3ae6f4c295042c09
)
set_target_properties(sfml-system PROPERTIES UNITY_BUILD ON)
diff --git a/include/SSVOpenHexagon/Utils/LuaMetadataProxy.hpp b/include/SSVOpenHexagon/Utils/LuaMetadataProxy.hpp
index 63a8876e..b3c7d7bd 100644
--- a/include/SSVOpenHexagon/Utils/LuaMetadataProxy.hpp
+++ b/include/SSVOpenHexagon/Utils/LuaMetadataProxy.hpp
@@ -4,7 +4,10 @@
#pragma once
+#ifdef SSVOH_PRODUCE_LUA_METADATA
#include "SSVOpenHexagon/Utils/ArgExtractor.hpp"
+#endif
+
#include "SSVOpenHexagon/Utils/TypeWrapper.hpp"
#include <string>