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
8fe63803
Commit
8fe63803
authored
Jun 01, 2016
by
Jan Möbius
Browse files
Switch ACG default to qt5.6
parent
f5ecf3ae
Pipeline
#2118
passed with stage
in 77 minutes and 10 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
8fe63803
...
...
@@ -2,9 +2,9 @@ cmake_minimum_required (VERSION 2.8.9)
# 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.
5.1
/5.
5
/gcc_64/
)
if
(
EXISTS /ACG/acgdev/gcc-4.9-x86_64/qt-5.
6.0
/5.
6
/gcc_64/
)
# Default to this install path for QT%_INSTALL_DIR
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-4.9-x86_64/qt-5.
5.1
/5.
5
/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment"
)
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"
)
endif
()
...
...
cmake/FindQwt6.cmake
View file @
8fe63803
...
...
@@ -29,7 +29,7 @@ endif()
if
(
QT5_FOUND
)
if
(
${
Qt5Core_VERSION_STRING
}
VERSION_EQUAL
"5.5.1"
OR
${
Qt5Core_VERSION_STRING
}
VERSION_GREATER
"5.5.1"
)
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1.2-qt5.
5.1
"
)
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1.2-qt5.
6
"
)
else
()
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5"
)
endif
()
...
...
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