Always use QLibrary for gtk to avoid confusing dynamic linker
This commit is contained in:
parent
087fbe89ce
commit
0a4b8fc7f6
1 changed files with 6 additions and 15 deletions
|
@ -113,25 +113,16 @@ if (LINUX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
|
if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
|
||||||
target_link_libraries(Telegram PRIVATE rt)
|
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
|
|
||||||
if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
|
pkg_check_modules(GTK REQUIRED gtk+-3.0)
|
||||||
pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
|
target_include_directories(Telegram SYSTEM PRIVATE ${GTK_INCLUDE_DIRS})
|
||||||
target_link_libraries(Telegram PRIVATE PkgConfig::GTK3)
|
|
||||||
|
|
||||||
if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
|
if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
|
||||||
pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
|
target_link_libraries(Telegram PRIVATE X11)
|
||||||
target_link_libraries(Telegram PRIVATE PkgConfig::X11)
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
pkg_check_modules(GTK REQUIRED gtk+-3.0)
|
|
||||||
target_include_directories(Telegram SYSTEM PRIVATE ${GTK_INCLUDE_DIRS})
|
|
||||||
|
|
||||||
if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
|
|
||||||
target_link_libraries(Telegram PRIVATE X11)
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
target_link_libraries(Telegram PRIVATE rt)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue