monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-10 21:04:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3015

Browse source 
e8bcabe cmake: fix static libraries linking (xiphon)
This commit is contained in:
luigi1111 2020-07-29 09:50:05 -05:00
commit 7972d8a219
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
CMakeLists.txt
View file

@ -315,16 +315,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
@ -333,10 +323,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
@ -347,7 +333,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()
@ -364,15 +350,31 @@ 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
Qt5FontDatabaseSupport
)
list(APPEND QT5_LIBRARIES if(UNIX AND NOT APPLE)
${FONTCONFIG_STATIC_LIBRARIES} list(APPEND QT5_INTEGRATION_LIBRARIES_LIST
${X11_XCB_STATIC_LIBRARIES} Qt5XcbQpa
xcb-static
Qt5ServiceSupport
Qt5GlxSupport
) )
endif() 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()
message(STATUS "Using Boost include dir at ${Boost_INCLUDE_DIRS}") message(STATUS "Using Boost include dir at ${Boost_INCLUDE_DIRS}")