projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CMakeLists.txt: Fix a build issue on MSYS2.
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index c8b4d6ad08740a1d9404db304e9d182bff80cf25..09f28a19c9ccf1f95e0513d8b38919d6bc32ea85 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-78,7
+78,10
@@
find_package(Qt5 COMPONENTS Core Gui Widgets Svg REQUIRED)
if(WIN32)
# MXE workaround: Use pkg-config to find Qt5 libs.
# https://github.com/mxe/mxe/issues/1642
if(WIN32)
# MXE workaround: Use pkg-config to find Qt5 libs.
# https://github.com/mxe/mxe/issues/1642
- pkg_check_modules(QT5ALL REQUIRED Qt5Widgets Qt5Gui Qt5Svg)
+ # Not required (and doesn't work) on MSYS2.
+ if(NOT DEFINED ENV{MSYSTEM})
+ pkg_check_modules(QT5ALL REQUIRED Qt5Widgets Qt5Gui Qt5Svg)
+ endif()
endif()
set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Svg)
endif()
set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Svg)
@@
-428,12
+431,15
@@
endif()
if(WIN32)
# On Windows we need to statically link the libqsvg imageformat
# plugin (and the QtSvg component) for SVG graphics/icons to work.
if(WIN32)
# On Windows we need to statically link the libqsvg imageformat
# plugin (and the QtSvg component) for SVG graphics/icons to work.
- # We also need QWindowsIntegrationPlugin, Qt5PlatformSupport
, and all
- # Qt libs and their dependencies.
+ # We also need QWindowsIntegrationPlugin, Qt5PlatformSupport
(only for
+ # Qt
< 5.8.0), and all Qt
libs and their dependencies.
add_definitions(-DQT_STATICPLUGIN)
list(APPEND PULSEVIEW_LINK_LIBS Qt5::QSvgPlugin)
list(APPEND PULSEVIEW_LINK_LIBS Qt5::QWindowsIntegrationPlugin)
add_definitions(-DQT_STATICPLUGIN)
list(APPEND PULSEVIEW_LINK_LIBS Qt5::QSvgPlugin)
list(APPEND PULSEVIEW_LINK_LIBS Qt5::QWindowsIntegrationPlugin)
- list(APPEND PULSEVIEW_LINK_LIBS -lQt5PlatformSupport ${QT5ALL_LDFLAGS})
+ if(Qt5Gui_VERSION VERSION_LESS 5.8.0)
+ list(APPEND PULSEVIEW_LINK_LIBS -lQt5PlatformSupport)
+ endif()
+ list(APPEND PULSEVIEW_LINK_LIBS ${QT5ALL_LDFLAGS})
endif()
if(ANDROID)
endif()
if(ANDROID)