From a541c82239f2291aaee62de865604d7b0c579c06 Mon Sep 17 00:00:00 2001
From: spinningtoilet <71576099+spinningtoilet0@users.noreply.github.com>
Date: Mon, 1 May 2023 06:57:46 -0400
Subject: [PATCH] fix GEODE_DISABLE_FMT_CONSTEVAL (#161)
---
CMakeLists.txt | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 509a69b2..ce0c7484 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,16 +73,17 @@ include(cmake/GeodeFile.cmake)
include(cmake/Platform.cmake)
include(cmake/CPM.cmake)
+CPMAddPackage("gh:geode-sdk/json#cef9c64")
+CPMAddPackage("gh:fmtlib/fmt#9.1.0")
+CPMAddPackage("gh:gulrak/filesystem#3e5b930")
+
# this is needed for cross compilation on linux,
# since fmtlib will fail to compile otherwise
if (GEODE_DISABLE_FMT_CONSTEVAL)
- target_compile_definitions(${PROJECT_NAME} INTERFACE -DFMT_CONSTEVAL=)
+ message(VERBOSE "Disabling FMT_CONSTEVAL")
+ target_compile_definitions(fmt PUBLIC -DFMT_CONSTEVAL=)
endif()
-CPMAddPackage("gh:geode-sdk/json#19cf6f4")
-CPMAddPackage("gh:fmtlib/fmt#9.1.0")
-CPMAddPackage("gh:gulrak/filesystem#3e5b930")
-
# Tulip hook (hooking)
if (PROJECT_IS_TOP_LEVEL AND NOT GEODE_BUILDING_DOCS)
set(TULIP_LINK_SOURCE ON)