Fix packeged LibLZMA usage.
This commit is contained in:
parent
8776c5c26e
commit
a3f3a38915
3 changed files with 19 additions and 13 deletions
2
external/auto_updates/xz/CMakeLists.txt
vendored
2
external/auto_updates/xz/CMakeLists.txt
vendored
|
|
@ -9,7 +9,7 @@ add_library(desktop-app::external_xz ALIAS external_xz)
|
|||
|
||||
if (DESKTOP_APP_USE_PACKAGED)
|
||||
find_package(LibLZMA REQUIRED)
|
||||
target_link_libraries(external_xz LibLZMA::LibLZMA)
|
||||
target_link_libraries(external_xz INTERFACE LibLZMA::LibLZMA)
|
||||
elseif (APPLE AND NOT build_osx)
|
||||
target_link_libraries(external_xz
|
||||
INTERFACE
|
||||
|
|
|
|||
28
external/qt/CMakeLists.txt
vendored
28
external/qt/CMakeLists.txt
vendored
|
|
@ -157,21 +157,26 @@ if (LINUX)
|
|||
-static-libstdc++
|
||||
-pthread
|
||||
-rdynamic
|
||||
-Wl,-wrap,aligned_alloc
|
||||
-Wl,-wrap,secure_getenv
|
||||
-Wl,-wrap,clock_gettime
|
||||
-Wl,--no-as-needed,-lrt
|
||||
)
|
||||
if (NOT build_linux32)
|
||||
if (DESKTOP_APP_USE_GLIBC_WRAPS)
|
||||
target_link_options(external_qt
|
||||
INTERFACE
|
||||
-Wl,-wrap,__divmodti4
|
||||
)
|
||||
else()
|
||||
target_link_options(external_qt
|
||||
INTERFACE
|
||||
-Wl,-wrap,__divmoddi4
|
||||
-Wl,-wrap,aligned_alloc
|
||||
-Wl,-wrap,secure_getenv
|
||||
-Wl,-wrap,clock_gettime
|
||||
-Wl,--no-as-needed,-lrt
|
||||
)
|
||||
if (NOT build_linux32)
|
||||
target_link_options(external_qt
|
||||
INTERFACE
|
||||
-Wl,-wrap,__divmodti4
|
||||
)
|
||||
else()
|
||||
target_link_options(external_qt
|
||||
INTERFACE
|
||||
-Wl,-wrap,__divmoddi4
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
target_link_static_libraries(external_qt
|
||||
INTERFACE
|
||||
|
|
@ -186,6 +191,7 @@ if (LINUX)
|
|||
xcb-render
|
||||
xkbcommon
|
||||
xkbcommon-x11
|
||||
Xrender
|
||||
icutu
|
||||
icui18n
|
||||
icuuc
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue