Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/urde
|
@ -19,3 +19,8 @@
|
||||||
[submodule "assetnameparser/tinyxml2"]
|
[submodule "assetnameparser/tinyxml2"]
|
||||||
path = assetnameparser/tinyxml2
|
path = assetnameparser/tinyxml2
|
||||||
url = ../tinyxml2.git
|
url = ../tinyxml2.git
|
||||||
|
[submodule "hecl-gui"]
|
||||||
|
|
||||||
|
path = hecl-gui
|
||||||
|
|
||||||
|
url = ../hecl-gui
|
||||||
|
|
|
@ -139,6 +139,20 @@ add_subdirectory(mpcksum)
|
||||||
add_subdirectory(gbalink)
|
add_subdirectory(gbalink)
|
||||||
add_subdirectory(visigen)
|
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("Qt version ${QT_VERSION} does not meet the minimum ${QT_MINIMUM_VERSION} requirement, hecl-gui will not be built")
|
||||||
|
else()
|
||||||
|
message("hecl-gui will be built with Qt verion ${QT_VERSION}")
|
||||||
|
add_subdirectory(hecl-gui)
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
message("Qt not found, hecl-gui will not be built")
|
||||||
|
endif()
|
||||||
unset(GIT_EXECUTABLE CACHE)
|
unset(GIT_EXECUTABLE CACHE)
|
||||||
find_package(Git)
|
find_package(Git)
|
||||||
if(GIT_FOUND)
|
if(GIT_FOUND)
|
||||||
|
|
After Width: | Height: | Size: 23 KiB |
After Width: | Height: | Size: 33 KiB |
After Width: | Height: | Size: 45 KiB |
After Width: | Height: | Size: 72 KiB |
After Width: | Height: | Size: 236 KiB |
After Width: | Height: | Size: 7.1 KiB |
After Width: | Height: | Size: 9.7 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 20 KiB |
After Width: | Height: | Size: 66 KiB |
After Width: | Height: | Size: 21 KiB |
After Width: | Height: | Size: 31 KiB |
After Width: | Height: | Size: 42 KiB |
After Width: | Height: | Size: 66 KiB |
After Width: | Height: | Size: 212 KiB |
After Width: | Height: | Size: 3.4 KiB |
After Width: | Height: | Size: 4.9 KiB |
After Width: | Height: | Size: 6.3 KiB |
After Width: | Height: | Size: 9.3 KiB |
After Width: | Height: | Size: 29 KiB |
After Width: | Height: | Size: 4.2 KiB |
After Width: | Height: | Size: 5.8 KiB |
After Width: | Height: | Size: 7.3 KiB |
After Width: | Height: | Size: 11 KiB |
After Width: | Height: | Size: 35 KiB |
After Width: | Height: | Size: 7.8 KiB |
After Width: | Height: | Size: 11 KiB |
After Width: | Height: | Size: 14 KiB |
After Width: | Height: | Size: 23 KiB |
After Width: | Height: | Size: 74 KiB |
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 2113bed95f80fea497e56deec12ea5364b858a3f
|