X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=da3cc09cc096a1b2ef7bf73e80de6053dc2072c2;hp=4af1f67bdaed73fee301c85b3ed5af3758434652;hb=7f8517f63ab9ff98938ceee486bb94c0aa80b74b;hpb=cf2b5b643b53f7f601420a32a032307307fa4bb2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4af1f67b..da3cc09c 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) @@ -340,8 +339,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)