From cf91e8badff0016a7f4fa8ad371beab566a4b8a7 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 6 Mar 2020 00:30:12 -0800 Subject: [PATCH] qrenderdoc: Use QMAKE_EXECUTABLE if QT_QMAKE_EXECUTABLE is not defined Debian's debhelper automatically defines this variable during cross compilation builds. Signed-off-by: Jordan Justen --- qrenderdoc/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt index 6d8fdb731..bad6e88ef 100644 --- a/qrenderdoc/CMakeLists.txt +++ b/qrenderdoc/CMakeLists.txt @@ -2,7 +2,11 @@ option(STATIC_QRENDERDOC "Compile qrenderdoc as static" OFF) option(QRENDERDOC_NO_CXX11_REGEX "Disable C++11 regex in scintilla" OFF) if( NOT DEFINED QT_QMAKE_EXECUTABLE ) - set( QT_QMAKE_EXECUTABLE "qmake" ) + if( DEFINED QMAKE_EXECUTABLE ) + set( QT_QMAKE_EXECUTABLE "${QMAKE_EXECUTABLE}" ) + else() + set( QT_QMAKE_EXECUTABLE "qmake" ) + endif() endif() set(QMAKE_QT5_COMMAND ${QT_QMAKE_EXECUTABLE} CACHE STRING "Command to run to invoke Qt5's qmake. Normally this is qmake, possibly with qtchooser, but might be qmake-qt5")