mirror of
https://github.com/geode-sdk/geode.git
synced 2024-11-27 09:55:34 -05:00
Merge branch 'main' of https://github.com/geode-sdk/geode
This commit is contained in:
commit
866401b994
1 changed files with 6 additions and 5 deletions
|
@ -73,16 +73,17 @@ include(cmake/GeodeFile.cmake)
|
||||||
include(cmake/Platform.cmake)
|
include(cmake/Platform.cmake)
|
||||||
include(cmake/CPM.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,
|
# this is needed for cross compilation on linux,
|
||||||
# since fmtlib will fail to compile otherwise
|
# since fmtlib will fail to compile otherwise
|
||||||
if (GEODE_DISABLE_FMT_CONSTEVAL)
|
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()
|
endif()
|
||||||
|
|
||||||
CPMAddPackage("gh:geode-sdk/json#19cf6f4")
|
|
||||||
CPMAddPackage("gh:fmtlib/fmt#9.1.0")
|
|
||||||
CPMAddPackage("gh:gulrak/filesystem#3e5b930")
|
|
||||||
|
|
||||||
# Tulip hook (hooking)
|
# Tulip hook (hooking)
|
||||||
if (PROJECT_IS_TOP_LEVEL AND NOT GEODE_BUILDING_DOCS)
|
if (PROJECT_IS_TOP_LEVEL AND NOT GEODE_BUILDING_DOCS)
|
||||||
set(TULIP_LINK_SOURCE ON)
|
set(TULIP_LINK_SOURCE ON)
|
||||||
|
|
Loading…
Reference in a new issue