Skip to content

Commit 3d3a916

Browse files
committed
BLD: Fix C++ build
1 parent 0d2cbdf commit 3d3a916

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# Changelog
22

3-
## 0.32.0 - 2025-04-01
3+
## 0.32.0 - 2025-04-02
44

55
### Enhancements
66
- Upgraded default date version to 3.0.3
7+
- Updated `vcpkg` baseline
78

89
### Breaking changes
910
- Upgraded default cpp-httplib version to 0.20.0 which requires OpenSSL >= 3.0

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_BUILD_TYPE STREQUAL "Debug")
111111
endif()
112112

113113
#
114-
# Model project dependencies
114+
# Project dependencies
115115
#
116116

117+
find_package(OpenSSL REQUIRED)
118+
find_package(Zstd REQUIRED)
119+
find_package(Threads REQUIRED)
120+
117121
include(FetchContent)
118122
# JSON
119123
if(${PROJECT_NAME_UPPERCASE}_USE_EXTERNAL_JSON)
@@ -213,10 +217,6 @@ else()
213217
# Ignore compiler warnings in headers
214218
add_system_include_property(date)
215219
endif()
216-
# openSSL
217-
find_package(OpenSSL REQUIRED)
218-
find_package(Zstd REQUIRED)
219-
find_package(Threads REQUIRED)
220220

221221
#
222222
# Platform-specific dependencies

cmake/FindZstd.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ if(ZSTD_FOUND AND NOT TARGET zstd::zstd)
5050
INTERFACE_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIR}
5151
)
5252
endif()
53+
# cpp-httplib only searches for zstd::libzstd
54+
if (NOT TARGET zstd::libzstd)
55+
add_library(zstd::libzstd ALIAS zstd::zstd)
56+
endif()
5357

5458
# Check if the Conan-provided target exists
5559
if(TARGET zstd::libzstd_static)

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
"openssl",
1010
"zstd"
1111
],
12-
"builtin-baseline": "d1e11918f5c88c1dd364b93e1452fea69bacd479"
12+
"builtin-baseline": "b02e341c927f16d991edbd915d8ea43eac52096c"
1313
}

0 commit comments

Comments
 (0)