projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: Split up divs during autoranging if needed
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 44f810e3c5fec71a299a166ee546a705ceb22ef8..3ae7e7d27711410d9f727661f10689f51def53f7 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-81,6
+81,11
@@
if(FORCE_QT4)
set(Qt5Core_FOUND FALSE)
else()
find_package(Qt5Core QUIET)
set(Qt5Core_FOUND FALSE)
else()
find_package(Qt5Core QUIET)
+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)
+endif()
endif()
if(Qt5Core_FOUND)
endif()
if(Qt5Core_FOUND)
@@
-97,11
+102,11
@@
else()
find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
endif()
find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
endif()
+set(BOOSTCOMPS filesystem serialization system thread)
if(ENABLE_TESTS)
if(ENABLE_TESTS)
- find_package(Boost 1.53 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
-else()
- find_package(Boost 1.53 COMPONENTS filesystem system thread REQUIRED)
+ list(APPEND BOOSTCOMPS unit_test_framework)
endif()
endif()
+find_package(Boost 1.55 COMPONENTS ${BOOSTCOMPS} REQUIRED)
# Find the platform's thread library (needed for C++11 threads).
# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
# Find the platform's thread library (needed for C++11 threads).
# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
@@
-216,6
+221,7
@@
set(pulseview_SOURCES
pv/data/analogsegment.cpp
pv/data/logic.cpp
pv/data/logicsegment.cpp
pv/data/analogsegment.cpp
pv/data/logic.cpp
pv/data/logicsegment.cpp
+ pv/data/signalbase.cpp
pv/data/signaldata.cpp
pv/data/segment.cpp
pv/devices/device.cpp
pv/data/signaldata.cpp
pv/data/segment.cpp
pv/devices/device.cpp
@@
-261,11
+267,12
@@
set(pulseview_SOURCES
pv/view/viewitempaintparams.cpp
pv/view/viewport.cpp
pv/view/viewwidget.cpp
pv/view/viewitempaintparams.cpp
pv/view/viewport.cpp
pv/view/viewwidget.cpp
+ pv/views/viewbase.cpp
+ pv/views/trace/standardbar.cpp
pv/widgets/colourbutton.cpp
pv/widgets/colourpopup.cpp
pv/widgets/devicetoolbutton.cpp
pv/widgets/exportmenu.cpp
pv/widgets/colourbutton.cpp
pv/widgets/colourpopup.cpp
pv/widgets/devicetoolbutton.cpp
pv/widgets/exportmenu.cpp
- pv/widgets/hidingmenubar.cpp
pv/widgets/importmenu.cpp
pv/widgets/popup.cpp
pv/widgets/popuptoolbutton.cpp
pv/widgets/importmenu.cpp
pv/widgets/popup.cpp
pv/widgets/popuptoolbutton.cpp
@@
-280,6
+287,11
@@
set(pulseview_HEADERS
pv/session.hpp
pv/storesession.hpp
pv/binding/device.hpp
pv/session.hpp
pv/storesession.hpp
pv/binding/device.hpp
+ pv/data/analog.hpp
+ pv/data/analogsegment.hpp
+ pv/data/logic.hpp
+ pv/data/logicsegment.hpp
+ pv/data/signalbase.hpp
pv/dialogs/about.hpp
pv/dialogs/connect.hpp
pv/dialogs/inputoutputoptions.hpp
pv/dialogs/about.hpp
pv/dialogs/connect.hpp
pv/dialogs/inputoutputoptions.hpp
@@
-313,11
+325,12
@@
set(pulseview_HEADERS
pv/view/viewitem.hpp
pv/view/viewport.hpp
pv/view/viewwidget.hpp
pv/view/viewitem.hpp
pv/view/viewport.hpp
pv/view/viewwidget.hpp
+ pv/views/viewbase.hpp
+ pv/views/trace/standardbar.hpp
pv/widgets/colourbutton.hpp
pv/widgets/colourpopup.hpp
pv/widgets/devicetoolbutton.hpp
pv/widgets/exportmenu.hpp
pv/widgets/colourbutton.hpp
pv/widgets/colourpopup.hpp
pv/widgets/devicetoolbutton.hpp
pv/widgets/exportmenu.hpp
- pv/widgets/hidingmenubar.hpp
pv/widgets/importmenu.hpp
pv/widgets/popup.hpp
pv/widgets/popuptoolbutton.hpp
pv/widgets/importmenu.hpp
pv/widgets/popup.hpp
pv/widgets/popuptoolbutton.hpp
@@
-396,6
+409,7
@@
add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-Wall -Wextra)
add_definitions(-std=c++11)
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-Wall -Wextra)
add_definitions(-std=c++11)
+add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1)
if(ENABLE_DECODE)
add_definitions(-DENABLE_DECODE)
if(ENABLE_DECODE)
add_definitions(-DENABLE_DECODE)
@@
-440,22
+454,22
@@
set(PULSEVIEW_LINK_LIBS
)
if(STATIC_PKGDEPS_LIBS)
)
if(STATIC_PKGDEPS_LIBS)
+ link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LDFLAGS})
list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LDFLAGS})
-if(WIN32)
- # Workaround for a MinGW linking issue.
- list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2")
-endif()
else()
else()
- list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LDFLAGS})
+ link_directories(${PKGDEPS_LIBRARY_DIRS})
+ list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
endif()
if(WIN32)
# On Windows we need to statically link the libqsvg imageformat
# plugin (and the QtSvg component) for SVG graphics/icons to work.
endif()
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.
add_definitions(-DQT_STATICPLUGIN)
add_definitions(-DQT_STATICPLUGIN)
- li
nk_directories("${QT_PLUGINS_DIR}/imageformats"
)
- list(APPEND PULSEVIEW_LINK_LIBS
"-lqsvg"
)
- list(APPEND PULSEVIEW_LINK_LIBS
${QT_QTSVG_LIBRARY
})
+ li
st(APPEND PULSEVIEW_LINK_LIBS Qt5::QSvgPlugin
)
+ list(APPEND PULSEVIEW_LINK_LIBS
Qt5::QWindowsIntegrationPlugin
)
+ list(APPEND PULSEVIEW_LINK_LIBS
-lQt5PlatformSupport ${QT5ALL_LDFLAGS
})
endif()
if(ANDROID)
endif()
if(ANDROID)