Skip to content

Commit 7970c6c

Browse files
authored
fix cmake warnings
1 parent 6f02866 commit 7970c6c

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

CMakeLists.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ cmake_minimum_required(VERSION 3.21)
22
project(rift)
33

44
include(cmake/CPM.cmake)
5-
CPMAddPackage("gh:fmtlib/fmt#64db979")
6-
CPMAddPackage("gh:geode-sdk/result#4106d12")
5+
6+
if (NOT TARGET fmt)
7+
CPMAddPackage("gh:fmtlib/fmt#12.1.0")
8+
endif ()
9+
if (NOT TARGET GeodeResult)
10+
CPMAddPackage("gh:geode-sdk/result@1.3.4")
11+
endif ()
712

813
set(CMAKE_CXX_STANDARD 20)
914

@@ -14,7 +19,9 @@ target_link_libraries(rift fmt GeodeResult)
1419

1520
# Allows an easier conversion of rift::Value to JSON and vice versa
1621
if (RIFT_INCLUDE_MATJSON)
17-
CPMAddPackage("gh:geode-sdk/json#0ea6009")
22+
if (NOT TARGET mat-json)
23+
CPMAddPackage("gh:geode-sdk/json@3.2.2")
24+
endif ()
1825
target_compile_definitions(rift PUBLIC RIFT_INCLUDE_MATJSON)
1926
target_link_libraries(rift mat-json)
2027
endif ()

0 commit comments

Comments
 (0)