Commit 5743f8b2 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'Update_Qt' into 'master'

Switch default to Qt 5.13.2

See merge request !348
parents fb475d75 9d695d60
Pipeline #13022 passed with stages
in 38 minutes and 53 seconds
......@@ -21,9 +21,9 @@ set( CMAKE_CXX_STANDARD 11 )
# ACG Environment default settings
# This is ugly but currently we need to work around the default installed on debian
if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.13.0/5.13.0/gcc_64 )
if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.13.2/5.13.2/gcc_64 )
# Default to this install path for QT%_INSTALL_DIR
set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.13.0/5.13.0/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment using QT 5.13.0" )
set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.13.2/5.13.2/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment using QT 5.13.2" )
endif()
if ( WIN32 )
......
Subproject commit 8f280fc9d47b7a165136a640cb9773fce05dcb5d
Subproject commit 13d4d19ac0be9870fa14ce900f20343bdedd1fe8
Subproject commit e2dbe2e08cc9719a5e537389f6b7367fe29feba0
Subproject commit be5e98274f5917b3e61fc743c0323e783d42796a
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment