Skip to content

Commit 21e700c

Browse files
authored
Update packages (#59)
1 parent 53144ae commit 21e700c

File tree

8 files changed

+1763
-1019
lines changed

8 files changed

+1763
-1019
lines changed

2015/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ if(POLICY CMP0135)
55
cmake_policy(SET CMP0135 NEW)
66
endif()
77

8+
# GoogleTest requires at least C++17
9+
set(CMAKE_CXX_STANDARD 17)
10+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
11+
812
include(FetchContent)
913

1014
FetchContent_Declare(
1115
googletest
12-
URL https://github.com/google/googletest/archive/f8d7d77c06936315286eb55f8de22cd23c188571.zip
16+
URL https://github.com/google/googletest/archive/52eb8108c5bdec04579160ae17225d66034bd723.zip
1317
)
1418

1519
FetchContent_Declare(
1620
json
17-
URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz
21+
URL https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz
1822
)
1923

2024
# For Windows: Prevent overriding the parent project's compiler/linker settings
@@ -23,9 +27,6 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
2327
FetchContent_MakeAvailable(googletest)
2428
FetchContent_MakeAvailable(json)
2529

26-
# GoogleTest requires at least C++11
27-
set(CMAKE_CXX_STANDARD 11)
28-
2930
add_subdirectory(libcommon)
3031

3132
file(GLOB DAYDIRS RELATIVE ${CMAKE_CURRENT_LIST_DIR} day*)

0 commit comments

Comments
 (0)