Skip to content

Commit d077177

Browse files
committed
Update packages and CPM
1 parent 351afd2 commit d077177

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

cmake/CPM.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#
33
# SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors
44

5-
set(CPM_DOWNLOAD_VERSION 0.40.2)
6-
set(CPM_HASH_SUM "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d")
5+
set(CPM_DOWNLOAD_VERSION 0.42.0)
6+
set(CPM_HASH_SUM "2020b4fc42dba44817983e06342e682ecfc3d2f484a581f11cc5731fbe4dce8a")
77

88
if(CPM_SOURCE_CACHE)
99
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")

test/members/CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,18 @@ target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_23)
1212
include(../../cmake/CPM.cmake)
1313

1414
set(MAT_JSON_AS_INTERFACE ON)
15-
CPMAddPackage("gh:fmtlib/fmt#11.1.4")
16-
CPMAddPackage("gh:geode-sdk/json@3.2.1")
15+
CPMAddPackage("gh:fmtlib/fmt#12.1.0")
16+
CPMAddPackage("gh:geode-sdk/result@1.3.3")
17+
CPMAddPackage("gh:geode-sdk/json@3.2.3")
1718
CPMAddPackage("gh:geode-sdk/TulipHook@2.4.4")
1819
CPMAddPackage("gh:zhihaoy/nontype_functional#8ec2e09")
20+
CPMAddPackage("gh:dankmeme01/arc#0d568d1")
1921

2022
if (WIN32)
2123
target_compile_definitions(fmt PRIVATE _HAS_ITERATOR_DEBUGGING=0)
2224
endif()
2325

24-
target_link_libraries(${PROJECT_NAME} PRIVATE fmt GeodeResult mat-json TulipHookInclude nontype_functional)
26+
target_link_libraries(${PROJECT_NAME} PRIVATE mat-json TulipHookInclude nontype_functional arc)
2527

2628
cmake_path(SET GEODE_LOADER_PATH $ENV{GEODE_SDK}/loader)
2729

@@ -145,11 +147,13 @@ target_include_directories(${PROJECT_NAME} PRIVATE
145147

146148
if (WIN32)
147149
if (MSVC)
148-
target_compile_options(${PROJECT_NAME} PRIVATE /bigobj /Zc:__cplusplus)
150+
target_compile_options(${PROJECT_NAME} PRIVATE /bigobj /O0)
149151
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
152+
target_compile_options(${PROJECT_NAME} PRIVATE -O0)
150153
target_link_options(${PROJECT_NAME} PRIVATE "-Wl,/errorlimit:0")
151154
endif()
152155
else()
156+
target_compile_options(${PROJECT_NAME} PRIVATE -O0)
153157
# Doesnt work on macos
154158
# target_link_options(${PROJECT_NAME} PRIVATE "-Wl,--error-limit=0")
155159
endif()

0 commit comments

Comments
 (0)