From: Bert Vermeulen <redacted>
Date: Sun, 5 May 2013 12:28:53 +0000 (+0200)
Subject: Fix build on systems with Qt5 installed
X-Git-Tag: pulseview-0.2.0~340
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=71df4fb73dc52eb6472219c8ee9d17abdb385cd2;ds=sidebyside

Fix build on systems with Qt5 installed

The 'qmake' installed on systems with Qt5 will generally default to
using that version. Despite the Qt4 requirement in the find_package()
directive, this will break even if Qt4 is installed.

This overrides the qmake version used to the check.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d835927e..ad226931 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,6 +62,7 @@ endif()
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
 find_package(Qt4 REQUIRED)
 
 # Find the platform's thread library (needed for boost-thread).