X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=8e2ac69505984c9094cf2c98d54f2dd39962d1f9;hp=4af1f67bdaed73fee301c85b3ed5af3758434652;hb=448a72cf7f0225eace2335ec05b979c4e9a6b882;hpb=cf2b5b643b53f7f601420a32a032307307fa4bb2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4af1f67b..8e2ac695 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,11 +88,10 @@ if(Qt5Core_FOUND) add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}) else() find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac) - find_package(Qt4 REQUIRED) - set(QT_USE_QTSVG TRUE) + find_package(Qt4 REQUIRED QtCore QtGui QtSvg) endif() -find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED) +find_package(Boost 1.42 COMPONENTS filesystem system thread 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. @@ -163,11 +162,14 @@ set(pulseview_SOURCES pv/view/header.cpp pv/view/marginwidget.cpp pv/view/logicsignal.cpp + pv/view/rowitem.cpp + pv/view/rowitemowner.cpp pv/view/ruler.cpp pv/view/selectableitem.cpp pv/view/signal.cpp pv/view/timemarker.cpp pv/view/trace.cpp + pv/view/tracegroup.cpp pv/view/tracepalette.cpp pv/view/view.cpp pv/view/viewport.cpp @@ -202,11 +204,13 @@ set(pulseview_HEADERS pv/view/header.h pv/view/logicsignal.h pv/view/marginwidget.h + pv/view/rowitem.h pv/view/ruler.h pv/view/selectableitem.h pv/view/signal.h pv/view/timemarker.h pv/view/trace.h + pv/view/tracegroup.h pv/view/view.h pv/view/viewport.h pv/widgets/colourbutton.h @@ -340,8 +344,8 @@ if(WIN32) # plugin (and the QtSvg component) for SVG graphics/icons to work. add_definitions(-DQT_STATICPLUGIN) link_directories("${QT_PLUGINS_DIR}/imageformats") - list(APPEND PULSEVIEW_LINK_LIBS ${QT_QTSVG_LIBRARY}) list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg") + list(APPEND PULSEVIEW_LINK_LIBS ${QT_QTSVG_LIBRARY}) endif() if(ANDROID)