Skip to content

Commit 8224c86

Browse files
committed
rev deps
1 parent 46fbe72 commit 8224c86

File tree

8 files changed

+9
-31
lines changed

8 files changed

+9
-31
lines changed

CMakeLists.txt

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ else()
77
# Enable vcpkg
88
set(CMAKE_TOOLCHAIN_FILE
99
"${EXTERNAL_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake")
10-
10+
1111
# Set the triplet
1212
if(WIN32)
1313
set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "VCPKG Triplet")
@@ -225,29 +225,7 @@ if(WIN32)
225225
add_definitions(-D_UNICODE)
226226
endif()
227227

228-
option(FULL_PROTOBUF "Link to full protobuf library instead of protobuf-lite" ON)
229-
230-
if(FULL_PROTOBUF)
231-
if(WIN32)
232-
set(PROTOBUF_LIBS protobuf::libprotobuf)
233-
else()
234-
set(PROTOBUF_LIBS ${PROTOBUF_LIBRARIES})
235-
endif()
236-
else()
237-
if(WIN32)
238-
set(PROTOBUF_LIBS protobuf::libprotobuf-lite)
239-
else()
240-
set(PROTOBUF_LIBS ${PROTOBUF_LITE_LIBRARIES})
241-
endif()
242-
endif()
243-
244-
# Needed for arch: https://github.com/protocolbuffers/protobuf/issues/15604
245-
if (Protobuf_VERSION VERSION_GREATER_EQUAL 4)
246-
find_package(absl REQUIRED)
247-
248-
set(PROTOBUF_LIBS ${PROTOBUF_LIBS} absl::log_internal_check_op)
249-
endif()
250-
228+
set(PROTOBUF_LIBS protobuf::libprotobuf)
251229

252230
if(SELINUX_FOUND)
253231
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_SELINUX")

external/Catch2

Submodule Catch2 updated 194 files

external/cpp-httplib

Submodule cpp-httplib updated 83 files

external/json

Submodule json updated 837 files

external/sentry-native

Submodule sentry-native updated 294 files

external/vcpkg

Submodule vcpkg updated 7233 files

0 commit comments

Comments
 (0)