X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=da3cc09cc096a1b2ef7bf73e80de6053dc2072c2;hp=31926adf5d5703ff4c476f635d0278389a5a2af1;hb=7f8517f63ab9ff98938ceee486bb94c0aa80b74b;hpb=e8d009288de28cb194bc7964f96677c2baf900c9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31926adf..da3cc09c 100644
--- 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
 #-------------------------------------------------------------------------------
@@ -81,13 +81,14 @@ if(Qt5Core_FOUND)
 	message("-- Using Qt5")
 	find_package(Qt5Widgets REQUIRED)
 	find_package(Qt5Gui REQUIRED)
+	find_package(Qt5Svg REQUIRED)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 	set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
-	set(QT_LIBRARIES Qt5::Gui Qt5::Widgets)
+	set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Svg)
 	add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
 else()
 	find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
-	find_package(Qt4 REQUIRED)
+	find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 endif()
 
 find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)
@@ -338,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)