1
0
Fork 0

Fix packeged LibLZMA usage.

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

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

View file

@ -157,21 +157,26 @@ if (LINUX)
-static-libstdc++ -static-libstdc++
-pthread -pthread
-rdynamic -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 target_link_options(external_qt
INTERFACE INTERFACE
-Wl,-wrap,__divmodti4 -Wl,-wrap,aligned_alloc
) -Wl,-wrap,secure_getenv
else() -Wl,-wrap,clock_gettime
target_link_options(external_qt -Wl,--no-as-needed,-lrt
INTERFACE
-Wl,-wrap,__divmoddi4
) )
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() endif()
target_link_static_libraries(external_qt target_link_static_libraries(external_qt
INTERFACE INTERFACE
@ -186,6 +191,7 @@ if (LINUX)
xcb-render xcb-render
xkbcommon xkbcommon
xkbcommon-x11 xkbcommon-x11
Xrender
icutu icutu
icui18n icui18n
icuuc icuuc

View file

@ -20,7 +20,7 @@ function(desktop_app_parse_version file)
if (NOT ${version} MATCHES "[0-9]+\.[0-9]+(\.[0-9]+(\.([0-9]+|beta)))") if (NOT ${version} MATCHES "[0-9]+\.[0-9]+(\.[0-9]+(\.([0-9]+|beta)))")
message(FATAL_ERROR "Bad version: ${version}, check ${file}") message(FATAL_ERROR "Bad version: ${version}, check ${file}")
endif() endif()
message("Version: ${version}") message("Version: ${version}")
string(REPLACE "." ";" components ${version}) string(REPLACE "." ";" components ${version})