aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/ECMQueryQmake.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/ECMQueryQmake.cmake b/modules/ECMQueryQmake.cmake
index 725e2eb6..c880671f 100644
--- a/modules/ECMQueryQmake.cmake
+++ b/modules/ECMQueryQmake.cmake
@@ -4,7 +4,7 @@ set(_qmake_executable_default "qmake-qt5")
if (TARGET Qt5::qmake)
get_target_property(_qmake_executable_default Qt5::qmake LOCATION)
endif()
-set(QMAKE_EXECUTABLE "qmake-qt5"
+set(QMAKE_EXECUTABLE ${_qmake_executable_default}
CACHE FILEPATH "Location of the Qt5 qmake executable")
# This is not public API (yet)!
@@ -14,8 +14,8 @@ function(query_qmake result_variable qt_variable)
RESULT_VARIABLE return_code
OUTPUT_VARIABLE output
)
- string(STRIP ${output} output)
if(return_code EQUAL 0)
+ string(STRIP "${output}" output)
file(TO_CMAKE_PATH "${output}" output_path)
set(${result_variable} "${output_path}" PARENT_SCOPE)
else()