diff options
| author | xiphon <xiphon@protonmail.com> | 2020-07-15 23:26:14 +0000 |
|---|---|---|
| committer | xiphon <xiphon@protonmail.com> | 2020-07-15 23:26:14 +0000 |
| commit | e8bcabe66b847f3b1d198b8ddf426f743a02da71 (patch) | |
| tree | 5f674b4e1b1b6f25c8dfab322bd6b1e1579f36dc | |
| parent | c137a6ea36040aee20366933935805eff67ae3f8 (diff) | |
| download | monzero-gui-e8bcabe66b847f3b1d198b8ddf426f743a02da71.tar.gz monzero-gui-e8bcabe66b847f3b1d198b8ddf426f743a02da71.tar.xz monzero-gui-e8bcabe66b847f3b1d198b8ddf426f743a02da71.zip | |
cmake: fix static libraries linking
| -rw-r--r-- | CMakeLists.txt | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 71efa7ca..8e819711 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -313,16 +313,6 @@ if(STATIC) qquicklayoutsplugin ) - if(UNIX AND NOT APPLE) - list(APPEND QT5_EXTRA_LIBRARIES_LIST - Qt5XcbQpa - xcb-static - Qt5ServiceSupport - xcb-glx - Qt5GlxSupport - ) - endif() - if(WITH_SCANNER) list(APPEND QT5_EXTRA_LIBRARIES_LIST declarative_multimedia @@ -331,10 +321,6 @@ if(STATIC) endif() list(APPEND QT5_EXTRA_LIBRARIES_LIST - Qt5EventDispatcherSupport - Qt5FontDatabaseSupport - Qt5PacketProtocol - Qt5ThemeSupport qtgraphicaleffectsplugin qtgraphicaleffectsprivate qtquick2plugin @@ -345,7 +331,7 @@ if(STATIC) set(QT5_EXTRA_LIBRARIES) 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}) endforeach() @@ -362,15 +348,31 @@ if(STATIC) ${QT5_LIBRARIES} ) - if(UNIX AND NOT APPLE) - pkg_check_modules(X11_XCB REQUIRED x11-xcb) - pkg_check_modules(FONTCONFIG REQUIRED fontconfig) + set(QT5_INTEGRATION_LIBRARIES_LIST + Qt5EventDispatcherSupport + Qt5PacketProtocol + Qt5ThemeSupport + Qt5FontDatabaseSupport + ) - list(APPEND QT5_LIBRARIES - ${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() message(STATUS "Using Boost include dir at ${Boost_INCLUDE_DIRS}") |