AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/urde

This commit is contained in:
Jack Andersen 2017-12-06 18:16:04 -10:00
parent 55cfb267c1 dd86d2b832
commit bcca196f91
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -148,20 +148,14 @@ add_subdirectory(mpcksum)
add_subdirectory(gbalink) add_subdirectory(gbalink)
add_subdirectory(visigen) add_subdirectory(visigen)
# Test for supported Qt version find_package(Qt5Widgets)
find_program(QMAKE_EXECUTABLE NAMES qmake HINTS ${QTDIR} ENV QTDIR PATH_SUFFIXES bin) if (Qt5Widgets_FOUND)
if (QMAKE_EXECUTABLE) message(STATUS "Qt5 found, hecl-gui will be built")
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) add_subdirectory(hecl-gui)
endif()
else() else()
message(STATUS "Qt not found, hecl-gui will not be built") message(STATUS "Qt5 not found, hecl-gui will not be built")
endif() endif()
unset(GIT_EXECUTABLE CACHE) unset(GIT_EXECUTABLE CACHE)
find_package(Git) find_package(Git)
if(GIT_FOUND) if(GIT_FOUND)

2
hecl-gui

@ -1 +1 @@
Subproject commit 2113bed95f80fea497e56deec12ea5364b858a3f Subproject commit fb20c5e4df58f1f0c46e395615340d21285fd97a