DecodeTrace: Refactor sample helpers and simplify method calls

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ee1d57a3d6ac2d29e826f31967c9090018c0b7a..da3cc09cc096a1b2ef7bf73e80de6053dc2072c2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,10 +23,10 @@ cmake_minimum_required(VERSION 2.8.6)
 include(FindPkgConfig)
 include(GNUInstallDirs)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
-
 project(pulseview)
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+
 #===============================================================================
 #= User Options
 #-------------------------------------------------------------------------------
@@ -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)