projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CMakeLists.txt: Only add Qt5PlatformSupport for Qt < 5.8.0.
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index b51753b6f790e6e1ca7849c344c0e2b14b34a10c..a2f12102501b0de26687732f448a655e2a036de7 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-58,10
+58,10
@@
endif()
list(APPEND PKGDEPS glib-2.0>=2.28.0)
list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
list(APPEND PKGDEPS glib-2.0>=2.28.0)
list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
-list(APPEND PKGDEPS libsigrokcxx>=0.
5
.0)
+list(APPEND PKGDEPS libsigrokcxx>=0.
6
.0)
if(ENABLE_DECODE)
if(ENABLE_DECODE)
- list(APPEND PKGDEPS libsigrokdecode>=0.
5
.0)
+ list(APPEND PKGDEPS libsigrokdecode>=0.
6
.0)
endif()
if(ANDROID)
endif()
if(ANDROID)
@@
-234,7
+234,6
@@
set(pulseview_SOURCES
pv/views/trace/rowitem.cpp
pv/views/trace/ruler.cpp
pv/views/trace/signal.cpp
pv/views/trace/rowitem.cpp
pv/views/trace/ruler.cpp
pv/views/trace/signal.cpp
- pv/views/trace/signalscalehandle.cpp
pv/views/trace/timeitem.cpp
pv/views/trace/timemarker.cpp
pv/views/trace/trace.cpp
pv/views/trace/timeitem.cpp
pv/views/trace/timemarker.cpp
pv/views/trace/trace.cpp
@@
-297,7
+296,6
@@
set(pulseview_HEADERS
pv/views/trace/rowitem.hpp
pv/views/trace/ruler.hpp
pv/views/trace/signal.hpp
pv/views/trace/rowitem.hpp
pv/views/trace/ruler.hpp
pv/views/trace/signal.hpp
- pv/views/trace/signalscalehandle.hpp
pv/views/trace/timeitem.hpp
pv/views/trace/timemarker.hpp
pv/views/trace/trace.hpp
pv/views/trace/timeitem.hpp
pv/views/trace/timemarker.hpp
pv/views/trace/trace.hpp
@@
-335,7
+333,6
@@
if(ENABLE_DECODE)
list(APPEND pulseview_SOURCES
pv/binding/decoder.cpp
pv/data/decodesignal.cpp
list(APPEND pulseview_SOURCES
pv/binding/decoder.cpp
pv/data/decodesignal.cpp
- pv/data/decoderstack.cpp
pv/data/decode/annotation.cpp
pv/data/decode/decoder.cpp
pv/data/decode/row.cpp
pv/data/decode/annotation.cpp
pv/data/decode/decoder.cpp
pv/data/decode/row.cpp
@@
-347,7
+344,6
@@
if(ENABLE_DECODE)
list(APPEND pulseview_HEADERS
pv/data/decodesignal.hpp
list(APPEND pulseview_HEADERS
pv/data/decodesignal.hpp
- pv/data/decoderstack.hpp
pv/views/trace/decodetrace.hpp
pv/widgets/decodergroupbox.hpp
pv/widgets/decodermenu.hpp
pv/views/trace/decodetrace.hpp
pv/widgets/decodergroupbox.hpp
pv/widgets/decodermenu.hpp
@@
-432,12
+428,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)
@@
-452,7
+451,7
@@
endif()
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
-if(WIN32)
+if(WIN32
AND NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug"
)
# Pass -mwindows so that no "DOS box" opens when PulseView is started.
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
endif()
# Pass -mwindows so that no "DOS box" opens when PulseView is started.
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
endif()