kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Fix packeged LibLZMA usage.

Browse source
This commit is contained in:
John Preston 2019-12-09 18:26:15 +03:00
parent 8776c5c26e
commit a3f3a38915
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/auto_updates/xz/CMakeLists.txt vendored
View file

@ -9,7 +9,7 @@ add_library(desktop-app::external_xz ALIAS external_xz)
if (DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED)
find_package(LibLZMA REQUIRED) 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) elseif (APPLE AND NOT build_osx)
target_link_libraries(external_xz target_link_libraries(external_xz
INTERFACE INTERFACE

6
external/qt/CMakeLists.txt vendored
View file

@ -157,6 +157,10 @@ if (LINUX)
-static-libstdc++ -static-libstdc++
-pthread -pthread
-rdynamic -rdynamic
)
if (DESKTOP_APP_USE_GLIBC_WRAPS)
target_link_options(external_qt
INTERFACE
-Wl,-wrap,aligned_alloc -Wl,-wrap,aligned_alloc
-Wl,-wrap,secure_getenv -Wl,-wrap,secure_getenv
-Wl,-wrap,clock_gettime -Wl,-wrap,clock_gettime
@ -173,6 +177,7 @@ if (LINUX)
-Wl,-wrap,__divmoddi4 -Wl,-wrap,__divmoddi4
) )
endif() endif()
endif()
target_link_static_libraries(external_qt target_link_static_libraries(external_qt
INTERFACE INTERFACE
SM SM
@ -186,6 +191,7 @@ if (LINUX)
xcb-render xcb-render
xkbcommon xkbcommon
xkbcommon-x11 xkbcommon-x11
Xrender
icutu icutu
icui18n icui18n
icuuc icuuc