Skip to content
Snippets Groups Projects
Commit 7bb57f24 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'feature_CmakeFindQt5.8' into 'master'

changed the default path for qt to the path of qt 5.8 for our lab

See merge request !11
parents 07248e97 84eb37cb
No related branches found
No related tags found
1 merge request!11changed the default path for qt to the path of qt 5.8 for our lab
......@@ -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-4.9-x86_64/qt-5.6.0/5.6/gcc_64/ )
if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.8.0/5.8/gcc_64/ )
# Default to this install path for QT%_INSTALL_DIR
set (QT5_INSTALL_PATH /ACG/acgdev/gcc-4.9-x86_64/qt-5.6.0/5.6/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" )
set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.8.0/5.8/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" )
endif()
if ( WIN32 )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment