lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-24 14:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong Qt cmake variable for qmake command being used

Browse Source
This commit is contained in:
baldurk
2019-09-02 11:37:55 +01:00
parent e15a10a0e6
commit e6d0c93b41
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/CMakeLists.txt
+2 -2
View File
@@ -9,7 +9,7 @@ set(QMAKE_QT5_COMMAND ${QT_QMAKE_EXECUTABLE} CACHE STRING "Command to run to inv
set(RENDERDOC_SWIG_PACKAGE https://github.com/baldurk/swig/archive/renderdoc-modified-7.zip CACHE STRING "The location where RenderDoc's swig fork source can be found. By default points to the URL on github but can be pointed to a local file.")
execute_process(
COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_VERSION
COMMAND ${QMAKE_QT5_COMMAND} -query QT_VERSION
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE QT_VERSION
ERROR_VARIABLE QT_VERSION_STDERR
@@ -21,7 +21,7 @@ execute_process(
if (QT_VERSION VERSION_GREATER 5.5.999)
message(STATUS "Building using Qt ${QT_VERSION}")
else()
message(FATAL_ERROR "${QT_QMAKE_EXECUTABLE} -query QT_VERSION returned: \"${QT_VERSION}\". Error output was: \"${QT_VERSION_STDERR}\". We require Qt >= 5.6 and for the qmake executable to run Qt5. Check your distribution for how to configure Qt5, you may need to set the QT_SELECT environment variable or customise the cmake variable QT_QMAKE_EXECUTABLE to qmake-qt5")
message(FATAL_ERROR "${QMAKE_QT5_COMMAND} -query QT_VERSION returned: \"${QT_VERSION}\". Error output was: \"${QT_VERSION_STDERR}\". We require Qt >= 5.6 and for the qmake executable to run Qt5. Check your distribution for how to configure Qt5, you may need to set the QT_SELECT environment variable or customise the cmake variable QMAKE_QT5_COMMAND to qmake-qt5")
endif()
set(QMAKE_CONFIG "debug")