|
@@ -77,9 +77,16 @@ if(NOT BUILD_SHARED_LIBS)
|
|
endif()
|
|
endif()
|
|
|
|
|
|
if(NOT DEFINED QT_QMAKE_EXECUTABLE)
|
|
if(NOT DEFINED QT_QMAKE_EXECUTABLE)
|
|
- find_program(QT_QMAKE_EXECUTABLE "qmake")
|
|
|
|
|
|
+ find_program(QT_QMAKE_EXECUTABLE "qmake" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
|
|
if(QT_QMAKE_EXECUTABLE STREQUAL QT_QMAKE_EXECUTABLE-NOTFOUND)
|
|
if(QT_QMAKE_EXECUTABLE STREQUAL QT_QMAKE_EXECUTABLE-NOTFOUND)
|
|
- message(FATAL_ERROR "Could not find qmake executable")
|
|
|
|
|
|
+ find_program(QT_QMAKE_EXECUTABLE "qmake")
|
|
|
|
+ if(QT_QMAKE_EXECUTABLE STREQUAL QT_QMAKE_EXECUTABLE-NOTFOUND)
|
|
|
|
+ message(FATAL_ERROR "Could not find qmake executable")
|
|
|
|
+ else()
|
|
|
|
+ message(STATUS "Use qmake ${QT_QMAKE_EXECUTABLE}")
|
|
|
|
+ endif()
|
|
|
|
+ else()
|
|
|
|
+ message(STATUS "Use qmake ${QT_QMAKE_EXECUTABLE}")
|
|
endif()
|
|
endif()
|
|
endif()
|
|
endif()
|
|
|
|
|