Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
82abcabb
Commit
82abcabb
authored
Nov 14, 2018
by
Jan Möbius
Browse files
Switched to qt 5.11.2 in ACG ENvironment
parent
7665aa31
Changes
1
Hide whitespace changes
Inline
Side-by-side
cmake/CMakeLists.txt
View file @
82abcabb
...
...
@@ -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.1
0.1
/5.1
0.1
/gcc_64
/
)
if
(
EXISTS /ACG/acgdev/gcc-x86_64/qt-5.1
1.2
/5.1
1.2
/gcc_64
)
# Default to this install path for QT%_INSTALL_DIR
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.1
0.1
/5.1
0.1
/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment"
)
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.1
1.2
/5.1
1.2
/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment
using QT 5.11.2
"
)
endif
()
if
(
WIN32
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment