Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenFlipper-Free
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
23
Issues
23
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
35ac25b9
Commit
35ac25b9
authored
Jun 28, 2019
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt 5.13
parent
e93e3dda
Pipeline
#11139
failed with stages
in 17 minutes and 57 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
CI/ci-linux-config.sh
CI/ci-linux-config.sh
+5
-3
CMakeLists.txt
CMakeLists.txt
+3
-3
OpenFlipper
OpenFlipper
+1
-1
No files found.
CI/ci-linux-config.sh
View file @
35ac25b9
...
...
@@ -48,9 +48,11 @@ elif [ "$LANGUAGE" == "C++11" ]; then
BUILDPATH
=
"
$BUILDPATH
-cpp11"
fi
if
[
"
$QTVERSION
"
==
"QT5.12.2"
]
;
then
if
[
"
$QTVERSION
"
==
"QT5.13.0"
]
;
then
echo
"Using QT5.13.0"
;
BUILDPATH
=
"
$BUILDPATH
-qt5.13.0"
OPTIONS
=
"
$OPTIONS
-DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.4-qt5.13.0/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.4-qt5.13.0/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.4-qt5.13.0/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64"
elif
[
"
$QTVERSION
"
==
"QT5.12.2"
]
;
then
echo
"Using QT5.12.2"
;
BUILDPATH
=
"
$BUILDPATH
-qt5.12.2"
OPTIONS
=
"
$OPTIONS
-DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.4-qt5.12.2/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.4-qt5.12.2/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.4-qt5.12.2/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64"
...
...
CMakeLists.txt
View file @
35ac25b9
...
...
@@ -21,9 +21,9 @@ set( CMAKE_CXX_STANDARD 11 )
# ACG Environment default settings
# 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.12.2
/gcc_64
)
if
(
EXISTS /ACG/acgdev/gcc-x86_64/qt-5.1
3.0/5.13.0
/gcc_64
)
# Default to this install path for QT%_INSTALL_DIR
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.1
2.2/5.12.2/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment using QT 5.12.2
"
)
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.1
3.0/5.13.0/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment using QT 5.13.0
"
)
endif
()
if
(
WIN32
)
...
...
@@ -128,7 +128,7 @@ if ( WIN32 )
endif
()
endif
()
set
(
OF_MAX_QT_VERSION
"5.1
2.2
"
)
set
(
OF_MAX_QT_VERSION
"5.1
3.0
"
)
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
@
a6232f27
Compare
31a7484c
...
a6232f27
Subproject commit
31a7484cd896f46941becc0852aa7c5e4f324bc6
Subproject commit
a6232f27fc7c5c442799fc8f8781a380d00021c8
Write
Preview
Markdown
is supported
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