Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix configure Windows build (Qt5) (#5586)

Browse Source
This commit is contained in:
Pavel Vatagin 2017-01-09 18:19:54 +04:00 committed by John Maguire
parent cb47beb4df
commit 446b382c74
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdparty/qxt/CMakeLists.txt vendored
View File

@ -28,4 +28,8 @@ ADD_LIBRARY(qxt STATIC
${QXT-SOURCES-MOC}
)
QT5_USE_MODULES(qxt Core Widgets X11Extras)
if(WIN32)
QT5_USE_MODULES(qxt Core Widgets)
else(WIN32)
QT5_USE_MODULES(qxt Core Widgets X11Extras)
endif(WIN32)

8
CMakeLists.txt
View File

@ -85,7 +85,7 @@ pkg_check_modules(TAGLIB REQUIRED taglib>=1.6)
if (WIN32)
find_package(ZLIB REQUIRED)
find_library(QTSPARKLE_LIBRARIES qtsparkle)
find_library(QTSPARKLE_LIBRARIES qtsparkle-qt5)
endif (WIN32)
find_library(LASTFM5_LIBRARIES lastfm5)
@ -299,7 +299,11 @@ if (HAVE_VK)
endif(HAVE_VK)
# We can include the Qt definitions now
set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent Qt5::X11Extras Qt5::DBus)
if(WIN32)
set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent)
else(WIN32)
set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent Qt5::X11Extras Qt5::DBus)
endif(WIN32)
# Remove GLU and GL from the link line - they're not really required
# and don't exist on my mingw toolchain