X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=d11f1430d4b9d76cf8e1ef175db8a9f8c26692b6;hb=722930c167711a4b59b4f4d5a9bab20d88b3f535;hp=4af1f67bdaed73fee301c85b3ed5af3758434652;hpb=cf2b5b643b53f7f601420a32a032307307fa4bb2;p=pulseview.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 4af1f67..d11f143 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,8 +88,7 @@ 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) @@ -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 @@ -207,6 +209,7 @@ set(pulseview_HEADERS 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 +343,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)