Commit aabb6c37 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'master' of www.graphics.rwth-aachen.de:OpenFlipper-Free/OpenFlipper-Free

parents 81defff2 ef7c7ca4
Pipeline #6968 passed with stages
in 109 minutes and 47 seconds
......@@ -20,9 +20,9 @@ set( CMAKE_CXX_STANDARD 11 )
# ACG Environment default settings
# This is ugly but currently we need to work around the default installed 5.3 on debian
if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.9.0/5.9/gcc_64/ )
if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.10.1/5.10.1/gcc_64/ )
# Default to this install path for QT%_INSTALL_DIR
set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.9.0/5.9/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" )
set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.10.1/5.10.1/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" )
endif()
if ( WIN32 )
......
Subproject commit 2b77f24aab1e622d4ce075a954cc1d78899503e5
Subproject commit f6c8e0fdce3049611c68672dde6e82978b590b0b
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