diff --git a/CMakeLists.txt b/CMakeLists.txt index 6603cac22..e0cadfe5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,20 +148,14 @@ add_subdirectory(mpcksum) add_subdirectory(gbalink) add_subdirectory(visigen) -# Test for supported Qt version -find_program(QMAKE_EXECUTABLE NAMES qmake HINTS ${QTDIR} ENV QTDIR PATH_SUFFIXES bin) -if (QMAKE_EXECUTABLE) - set(QT_MINIMUM_VERSION 5.3.0) - execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_VERSION OUTPUT_VARIABLE QT_VERSION) - if(QT_VERSION LESS QT_MINIMUM_VERSION) - message(WARNING "Qt version ${QT_VERSION} does not meet the minimum ${QT_MINIMUM_VERSION} requirement, hecl-gui will not be built") - else() - message(STATUS "hecl-gui will be built with Qt verion ${QT_VERSION}") - add_subdirectory(hecl-gui) - endif() +find_package(Qt5Widgets) +if (Qt5Widgets_FOUND) + message(STATUS "Qt5 found, hecl-gui will be built") + add_subdirectory(hecl-gui) else() - message(STATUS "Qt not found, hecl-gui will not be built") + message(STATUS "Qt5 not found, hecl-gui will not be built") endif() + unset(GIT_EXECUTABLE CACHE) find_package(Git) if(GIT_FOUND) diff --git a/hecl-gui b/hecl-gui index 2113bed95..fb20c5e4d 160000 --- a/hecl-gui +++ b/hecl-gui @@ -1 +1 @@ -Subproject commit 2113bed95f80fea497e56deec12ea5364b858a3f +Subproject commit fb20c5e4df58f1f0c46e395615340d21285fd97a