fix: further dependency export cleanup

CHANGELOG.md

@@ -2,10 +2,19 @@
 
 ## Unreleased
 
+**Fixes**:
+
+- Further clean up of the exported dependency configuration. ([#1013](https://github.com/getsentry/sentry-native/pull/1013), [crashpad#106](https://github.com/getsentry/crashpad/pull/106))
+
 **Internal**:
 
 - Updated `crashpad` to 2024-06-11. ([#1014](https://github.com/getsentry/sentry-native/pull/1014), [crashpad#105](https://github.com/getsentry/crashpad/pull/105))
 
+**Thank you**:
+
+- [@JonLiu1993](https://github.com/JonLiu1993)
+- [@dg0yt](https://github.com/dg0yt)
+
 ## 0.7.6
 
 **Fixes**:

CMakeLists.txt

@@ -62,6 +62,7 @@ option(SENTRY_BUILD_EXAMPLES "Build sentry-native example(s)" "${SENTRY_MAIN_PRO
 
 option(SENTRY_LINK_PTHREAD "Link platform threads library" ON)
 if(SENTRY_LINK_PTHREAD)
+	set(THREADS_PREFER_PTHREAD_FLAG ON)
 	find_package(Threads REQUIRED)
 endif()
 
@@ -276,15 +277,15 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS400")
 endif()
 
 if(SENTRY_TRANSPORT_CURL)
-	if(NOT CURL_FOUND) # Some other lib might bring libcurl already
+	if(NOT TARGET CURL::libcurl) # Some other lib might bring libcurl already
 		find_package(CURL REQUIRED COMPONENTS AsynchDNS)
 	endif()
 
 	target_link_libraries(sentry PRIVATE CURL::libcurl)
 endif()
 
 if(SENTRY_TRANSPORT_COMPRESSION)
-	if(NOT ZLIB_FOUND)
+	if(NOT TARGET ZLIB::ZLIB)
 		find_package(ZLIB REQUIRED)
 	endif()
 
@@ -387,11 +388,7 @@ if(SENTRY_LINK_PTHREAD)
 endif()
 
 # apply platform libraries to sentry library
-if(SENTRY_LIBRARY_TYPE STREQUAL "STATIC")
-	target_link_libraries(sentry PUBLIC ${_SENTRY_PLATFORM_LIBS})
-else()
-	target_link_libraries(sentry PRIVATE ${_SENTRY_PLATFORM_LIBS})
-endif()
+target_link_libraries(sentry PRIVATE ${_SENTRY_PLATFORM_LIBS})
 
 # suppress some errors and warnings for MinGW target
 if(MINGW)

sentry-config.cmake.in

@@ -5,30 +5,26 @@ set(SENTRY_BACKEND @SENTRY_BACKEND@)
 set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@)
 set(SENTRY_BUILD_SHARED_LIBS @SENTRY_BUILD_SHARED_LIBS@)
 set(SENTRY_LINK_PTHREAD @SENTRY_LINK_PTHREAD@)
+set(SENTRY_TRANSPORT_COMPRESSION @SENTRY_TRANSPORT_COMPRESSION@)
+set(SENTRY_BREAKPAD_SYSTEM @SENTRY_BREAKPAD_SYSTEM@)
+set(CRASHPAD_ZLIB_SYSTEM @CRASHPAD_ZLIB_SYSTEM@)
 
-if(SENTRY_BACKEND STREQUAL "crashpad")
-	include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake")
-	if(NOT MSVC AND NOT SENTRY_BUILD_SHARED_LIBS)
-		find_dependency(ZLIB REQUIRED)
-	endif()
+if(NOT SENTRY_BUILD_SHARED_LIBS)
+    if(SENTRY_TRANSPORT_COMPRESSION OR CRASHPAD_ZLIB_SYSTEM)
+    	find_dependency(ZLIB)
+    endif()
+    if(SENTRY_BACKEND STREQUAL "breakpad" AND SENTRY_BREAKPAD_SYSTEM)
+    	find_dependency(PkgConfig)
+    	pkg_check_modules(BREAKPAD REQUIRED IMPORTED_TARGET breakpad-client)
+    endif()
+    if(SENTRY_TRANSPORT STREQUAL "curl")
+    	find_dependency(CURL COMPONENTS AsynchDNS)
+    endif()
+    if(SENTRY_LINK_PTHREAD)
+        set(THREADS_PREFER_PTHREAD_FLAG ON)
+    	find_dependency(Threads)
+    endif()
 endif()
 
-if(SENTRY_BACKEND STREQUAL "breakpad" AND NOT SENTRY_BUILD_SHARED_LIBS)
-	set(SENTRY_BREAKPAD_SYSTEM @SENTRY_BREAKPAD_SYSTEM@)
-	if(SENTRY_BREAKPAD_SYSTEM)
-		find_dependency(PkgConfig REQUIRED)
-		pkg_check_modules(BREAKPAD REQUIRED IMPORTED_TARGET breakpad-client)
-	endif()
-endif()
-
-include("${CMAKE_CURRENT_LIST_DIR}/sentry-targets.cmake")
-
-if(SENTRY_TRANSPORT STREQUAL "curl" AND (NOT @BUILD_SHARED_LIBS@ OR NOT SENTRY_BUILD_SHARED_LIBS))
-	find_dependency(CURL REQUIRED)
-	set_property(TARGET sentry::sentry APPEND
-		PROPERTY INTERFACE_LINK_LIBRARIES ${CURL_LIBRARIES})
-endif()
-
-if(SENTRY_LINK_PTHREAD AND NOT SENTRY_BUILD_SHARED_LIBS)
-	find_dependency(Threads REQUIRED)
-endif()
+include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake" OPTIONAL)
+include("${CMAKE_CURRENT_LIST_DIR}/sentry-targets.cmake")