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
f99a7a71
Commit
f99a7a71
authored
Mar 08, 2019
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Removed some QT4 references
- Moved to 4.1 version
parent
69c657d5
Pipeline
#9072
passed with stages
in 46 minutes
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
CI/ci-linux-build.sh
CI/ci-linux-build.sh
+1
-1
CI/ci-linux-config.sh
CI/ci-linux-config.sh
+1
-1
CI/ci-linux-test.sh
CI/ci-linux-test.sh
+2
-2
OpenFlipper
OpenFlipper
+1
-1
No files found.
CI/ci-linux-build.sh
View file @
f99a7a71
...
...
@@ -6,7 +6,7 @@ set -e
# Expected Settings via environment variables:
# COMPILER= gcc/clang
# LANGUAGE= C++98 / C++11
# QTVERSION= QT
4/QT
5
# QTVERSION= QT5
# BUILDTYPE= Debug / Release
...
...
CI/ci-linux-config.sh
View file @
f99a7a71
...
...
@@ -54,7 +54,7 @@ if [ "$QTVERSION" == "QT5.11.2" ]; then
elif
[
"
$QTVERSION
"
==
"QT5.9.0"
]
;
then
echo
"Using QT5.9.0"
;
BUILDPATH
=
"
$BUILDPATH
-qt5.9.0"
OPTIONS
=
"
$OPTIONS
-D
FORCE_QT4=FALSE -D
QWT6_INCLUDE_DIR=~/sw/qwt-6.1.3-qt5.9.0/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.3-qt5.9.0/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.3-qt5.9.0/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64"
OPTIONS
=
"
$OPTIONS
-DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.3-qt5.9.0/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.3-qt5.9.0/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.3-qt5.9.0/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64"
fi
if
[
"
$PYTHON
"
==
"no"
]
;
then
...
...
CI/ci-linux-test.sh
View file @
f99a7a71
...
...
@@ -6,7 +6,7 @@ set -e
# Expected Settings via environment variables:
# COMPILER= gcc/clang
# LANGUAGE= C++98 / C++11
# QTVERSION= QT
4/QT
5
# QTVERSION= QT5
# BUILDTYPE= Debug / Release
#include ci options script
...
...
@@ -55,4 +55,4 @@ export LD_LIBRARY_PATH=$(pwd)/Build/systemlib:$LD_LIBRARY_PATH
cd
tests
bash run_tests.sh
cd
..
\ No newline at end of file
cd
..
OpenFlipper
@
e35e0232
Compare
87544470
...
e35e0232
Subproject commit
87544470cb073f91512e82793ff51df00afaf4c2
Subproject commit
e35e0232fff9ebf7b88ac05d4d38e9c480107f2b
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