Dominique Leuenberger
f7dc999073
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:Apps/rpi-imager?expand=0&rev=29
54 lines
1.4 KiB
Diff
54 lines
1.4 KiB
Diff
--- a/src/CMakeLists.txt 2026-01-22 14:31:04.000000000 +0000
|
|
+++ b/src/CMakeLists.txt 2026-02-12 20:13:09.887831559 +0000
|
|
@@ -170,26 +170,24 @@
|
|
set(BUILD_STATIC_LIBS ON)
|
|
set(BUILD_SHARED_LIBS OFF)
|
|
|
|
-include(FetchContent)
|
|
-
|
|
# Bundled liblzma
|
|
-include(dependencies/xz.cmake)
|
|
+find_package(LibLZMA 5.8.1 REQUIRED)
|
|
|
|
# Bundled zstd
|
|
-include(dependencies/zstd.cmake)
|
|
+find_package(zstd 1.5.7 REQUIRED)
|
|
|
|
# Remote nghttp2
|
|
-include(dependencies/nghttp2.cmake)
|
|
+find_package(PkgConfig)
|
|
+pkg_check_modules(nghttp2 REQUIRED libnghttp2>=1.68.0)
|
|
|
|
# Bundled yescrypt
|
|
include(dependencies/yescrypt.cmake)
|
|
|
|
-
|
|
# Bundled zlib
|
|
-include(dependencies/zlib.cmake)
|
|
+find_package(ZLIB REQUIRED)
|
|
|
|
# Bundled libarchive
|
|
-include(dependencies/libarchive.cmake)
|
|
+find_package(LibArchive 3.8.4 REQUIRED)
|
|
|
|
# libcurl
|
|
if(APPLE)
|
|
@@ -203,7 +200,7 @@
|
|
# Note: No need to find OpenSSL on macOS - we use native Security.framework
|
|
# for RSA operations and CommonCrypto for hashing
|
|
else()
|
|
- include(dependencies/curl.cmake)
|
|
+ find_package(CURL 8.17.0 REQUIRED)
|
|
endif()
|
|
|
|
|
|
@@ -535,7 +532,7 @@
|
|
include(linux/PlatformPackaging.cmake)
|
|
endif()
|
|
|
|
-add_dependencies(${PROJECT_NAME} zlibstatic yescrypt)
|
|
+add_dependencies(${PROJECT_NAME} yescrypt)
|
|
include_directories(${CURL_INCLUDE_DIR} ${LibArchive_INCLUDE_DIR} ${LIBLZMA_INCLUDE_DIRS} ${LIBDRM_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${ZSTD_INCLUDE_DIR} ${YESCRYPT_INCLUDE_DIR})
|
|
|
|
# Link different Qt components based on build type
|