4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-02-25 20:35:24 +02:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

cmake: fix static libraries linking

Browse Source
This commit is contained in:
xiphon 2020-07-15 23:26:14 +00:00
parent c137a6ea36
commit e8bcabe66b
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
CMakeLists.txt
View File

@ -313,16 +313,6 @@ if(STATIC)
qquicklayoutsplugin qquicklayoutsplugin
) )
if(UNIX AND NOT APPLE)
list(APPEND QT5_EXTRA_LIBRARIES_LIST
Qt5XcbQpa
xcb-static
Qt5ServiceSupport
xcb-glx
Qt5GlxSupport
)
endif()
if(WITH_SCANNER) if(WITH_SCANNER)
list(APPEND QT5_EXTRA_LIBRARIES_LIST list(APPEND QT5_EXTRA_LIBRARIES_LIST
declarative_multimedia declarative_multimedia
@ -331,10 +321,6 @@ if(STATIC)
endif() endif()
list(APPEND QT5_EXTRA_LIBRARIES_LIST list(APPEND QT5_EXTRA_LIBRARIES_LIST
Qt5EventDispatcherSupport
Qt5FontDatabaseSupport
Qt5PacketProtocol
Qt5ThemeSupport
qtgraphicaleffectsplugin qtgraphicaleffectsplugin
qtgraphicaleffectsprivate qtgraphicaleffectsprivate
qtquick2plugin qtquick2plugin
@ -345,7 +331,7 @@ if(STATIC)
set(QT5_EXTRA_LIBRARIES) set(QT5_EXTRA_LIBRARIES)
foreach(LIBRARY ${QT5_EXTRA_LIBRARIES_LIST}) foreach(LIBRARY ${QT5_EXTRA_LIBRARIES_LIST})
find_library(${LIBRARY}_LIBRARY ${LIBRARY} PATHS ${QT5_EXTRA_PATHS}) find_library(${LIBRARY}_LIBRARY ${LIBRARY} PATHS ${QT5_EXTRA_PATHS} REQUIRED)
list(APPEND QT5_EXTRA_LIBRARIES ${${LIBRARY}_LIBRARY}) list(APPEND QT5_EXTRA_LIBRARIES ${${LIBRARY}_LIBRARY})
endforeach() endforeach()
@ -362,14 +348,30 @@ if(STATIC)
${QT5_LIBRARIES} ${QT5_LIBRARIES}
) )
if(UNIX AND NOT APPLE) set(QT5_INTEGRATION_LIBRARIES_LIST
pkg_check_modules(X11_XCB REQUIRED x11-xcb) Qt5EventDispatcherSupport
pkg_check_modules(FONTCONFIG REQUIRED fontconfig) Qt5PacketProtocol
Qt5ThemeSupport
list(APPEND QT5_LIBRARIES Qt5FontDatabaseSupport
${FONTCONFIG_STATIC_LIBRARIES}
${X11_XCB_STATIC_LIBRARIES}
) )
if(UNIX AND NOT APPLE)
list(APPEND QT5_INTEGRATION_LIBRARIES_LIST
Qt5XcbQpa
xcb-static
Qt5ServiceSupport
Qt5GlxSupport
)
endif()
foreach(LIBRARY ${QT5_INTEGRATION_LIBRARIES_LIST})
find_library(${LIBRARY}_LIBRARY ${LIBRARY} PATHS ${QT5_EXTRA_PATHS} REQUIRED)
list(APPEND QT5_LIBRARIES ${${LIBRARY}_LIBRARY})
endforeach()
if(UNIX AND NOT APPLE)
pkg_check_modules(X11XCB_XCBGLX_FONTCONFIG REQUIRED x11-xcb xcb-glx fontconfig)
list(APPEND QT5_LIBRARIES ${X11XCB_XCBGLX_FONTCONFIG_STATIC_LIBRARIES})
endif() endif()
endif() endif()