Skip to content

Commit b9e7882

Browse files
supervacuusStrive-Sun
authored andcommitted
Remove build remnants of CMake <= 3.12...
...we require 3.16.4 for almost 4 years. Android is set to 3.10, but doesn't support either curl or crashpad.
1 parent cac3847 commit b9e7882

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

CMakeLists.txt

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -280,17 +280,7 @@ if(SENTRY_TRANSPORT_CURL)
280280
find_package(CURL REQUIRED COMPONENTS AsynchDNS)
281281
endif()
282282

283-
if(TARGET CURL::libcurl) # Only available in cmake 3.12+
284-
target_link_libraries(sentry PRIVATE CURL::libcurl)
285-
else()
286-
# Needed for cmake < 3.12 support (cmake 3.12 introduced the target CURL::libcurl)
287-
target_include_directories(sentry PRIVATE ${CURL_INCLUDE_DIR})
288-
# The exported sentry target must not contain any path of the build machine, therefore use generator expressions
289-
string(REPLACE ";" "$<SEMICOLON>" GENEX_CURL_LIBRARIES "${CURL_LIBRARIES}")
290-
string(REPLACE ";" "$<SEMICOLON>" GENEX_CURL_COMPILE_DEFINITIONS "${CURL_COMPILE_DEFINITIONS}")
291-
target_link_libraries(sentry PRIVATE $<BUILD_INTERFACE:${GENEX_CURL_LIBRARIES}>)
292-
target_compile_definitions(sentry PRIVATE $<BUILD_INTERFACE:${GENEX_CURL_COMPILE_DEFINITIONS}>)
293-
endif()
283+
target_link_libraries(sentry PRIVATE CURL::libcurl)
294284
endif()
295285

296286
if(SENTRY_TRANSPORT_COMPRESSION)
@@ -428,9 +418,6 @@ if(SENTRY_WITH_LIBUNWINDSTACK)
428418
endif()
429419

430420
if(SENTRY_BACKEND_CRASHPAD)
431-
# FIXME: required for cmake 3.12 and lower:
432-
# - NEW behavior lets normal variable override option
433-
cmake_policy(SET CMP0077 NEW)
434421
if(SENTRY_BUILD_SHARED_LIBS)
435422
set(CRASHPAD_ENABLE_INSTALL OFF CACHE BOOL "Enable crashpad installation" FORCE)
436423
else()

0 commit comments

Comments
 (0)