]> sigrok.org Git - pulseview.git/commitdiff
Fix build on systems with Qt5 installed
authorBert Vermeulen <redacted>
Sun, 5 May 2013 12:28:53 +0000 (14:28 +0200)
committerJoel Holdsworth <redacted>
Sun, 19 May 2013 19:32:33 +0000 (20:32 +0100)
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.

CMakeLists.txt

index d835927ebb504a0696d07b5a0b84b5f49fa1015d..ad226931dafdd978760b7fc0978e6ffd3ea27aae 100644 (file)
@@ -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).