Skip to content
GitLab
Menu
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-Free
Commits
b491565b
Commit
b491565b
authored
Apr 12, 2019
by
Jan Möbius
Browse files
Updated tested Qt version to 5.12.2
parent
ae61b84c
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b491565b
...
...
@@ -20,10 +20,10 @@ set( CMAKE_CXX_STANDARD_REQUIRED TRUE )
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
1
.2/5.1
1
.2/gcc_64
)
# This is ugly but currently we need to work around the default installed on debian
if
(
EXISTS /ACG/acgdev/gcc-x86_64/qt-5.1
2
.2/5.1
2
.2/gcc_64
)
# Default to this install path for QT%_INSTALL_DIR
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.1
1
.2"
)
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.1
2
.2/5.1
2
.2/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment using QT 5.1
2
.2"
)
endif
()
if
(
WIN32
)
...
...
@@ -128,7 +128,7 @@ if ( WIN32 )
endif
()
endif
()
set
(
OF_MAX_QT_VERSION
"5.
9.0
"
)
set
(
OF_MAX_QT_VERSION
"5.
12.2
"
)
if
(
${
Qt5Core_VERSION_STRING
}
STRGREATER
${
OF_MAX_QT_VERSION
}
)
message
(
WARNING
"Detected QT Version higher than
${
OF_MAX_QT_VERSION
}
!
\n
"
"OpenFlipper has not been tested with this QT Version."
)
...
...
OpenFlipper
@
2d469a90
Subproject commit
69c91dbd860d169d5ebfc4735c0d2b536e611362
Subproject commit
2d469a90529603e674a47e143ebeeeb0d5c6c995
Type-OpenVolumeMesh
@
58cb63d0
Subproject commit
da219249323d950f138233754935518e55af3c32
Subproject commit
58cb63d0e6398b639ffe73c0cd16ed0c8bb88bc0
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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