Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenFlipper-Free
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
24
Issues
24
List
Boards
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
b489b634
Commit
b489b634
authored
Feb 27, 2019
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed GLEW library hints from CI
parent
6dffb9d0
Pipeline
#8875
failed with stages
in 15 minutes and 40 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
18 deletions
+4
-18
CI/ci-mac-build.sh
CI/ci-mac-build.sh
+1
-1
CI/ci-mac-deploy.sh
CI/ci-mac-deploy.sh
+1
-1
CI/ci-mac-test.sh
CI/ci-mac-test.sh
+1
-1
CI/ci-windows-config.bat
CI/ci-windows-config.bat
+1
-15
No files found.
CI/ci-mac-build.sh
View file @
b489b634
...
...
@@ -15,7 +15,7 @@ fi
cd
build-release
# Build without ports to avoid qt4 collision
/opt/local/bin/cmake ../
-DCMAKE_CXX_FLAGS
=
'-std=c++11'
-DQWT6_INCLUDE_DIR
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework/Headers
-DQWT6_LIBRARY
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework
-DQT5_INSTALL_PATH
=
/Users/jenkins/sw/Qt/5.11.3/clang_64/
-DGLEW_INCLUDE_DIR
=
/Users/jenkins/sw/glew-1.10.0-installed/include/
-DGLEW_LIBRARY
=
/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib
/opt/local/bin/cmake ../
-DCMAKE_CXX_FLAGS
=
'-std=c++11'
-DQWT6_INCLUDE_DIR
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework/Headers
-DQWT6_LIBRARY
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework
-DQT5_INSTALL_PATH
=
/Users/jenkins/sw/Qt/5.11.3/clang_64/
make
-j2
...
...
CI/ci-mac-deploy.sh
View file @
b489b634
...
...
@@ -27,7 +27,7 @@ fi
# Build without ports to avoid qt4 collision
# fix pathes if run on a different machine
/opt/local/bin/cmake ../
-DCMAKE_CXX_FLAGS
=
'-std=c++11'
-DQWT6_INCLUDE_DIR
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework/Headers
-DQWT6_LIBRARY
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework
-DQT5_INSTALL_PATH
=
/Users/jenkins/sw/Qt/5.11.3/clang_64/
-DGLEW_INCLUDE_DIR
=
/Users/jenkins/sw/glew-1.10.0-installed/include/
-DGLEW_LIBRARY
=
/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib
/opt/local/bin/cmake ../
-DCMAKE_CXX_FLAGS
=
'-std=c++11'
-DQWT6_INCLUDE_DIR
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework/Headers
-DQWT6_LIBRARY
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework
-DQT5_INSTALL_PATH
=
/Users/jenkins/sw/Qt/5.11.3/clang_64/
rm
-f
*
.dmg
...
...
CI/ci-mac-test.sh
View file @
b489b634
...
...
@@ -27,7 +27,7 @@ fi
# Build without ports to avoid qt4 collision
# run this prior testing to fix paths
/opt/local/bin/cmake ../
-DCMAKE_CXX_FLAGS
=
'-std=c++11'
-DQWT6_INCLUDE_DIR
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework/Headers
-DQWT6_LIBRARY
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework
-DQT5_INSTALL_PATH
=
/Users/jenkins/sw/Qt/5.11.3/clang_64/
-DGLEW_INCLUDE_DIR
=
/Users/jenkins/sw/glew-1.10.0-installed/include/
-DGLEW_LIBRARY
=
/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib
/opt/local/bin/cmake ../
-DCMAKE_CXX_FLAGS
=
'-std=c++11'
-DQWT6_INCLUDE_DIR
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework/Headers
-DQWT6_LIBRARY
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework
-DQT5_INSTALL_PATH
=
/Users/jenkins/sw/Qt/5.11.3/clang_64/
########################################
...
...
CI/ci-windows-config.bat
View file @
b489b634
...
...
@@ -74,20 +74,6 @@ for /l %%x in (6, 1, 7) do (
)
)
:: check for glew version 1.1 to 1.3 use the highest found version
for
/l
%%x
in
(
0
,
1
,
3
)
do
(
if
exist
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
1
.1
%%x
.0\include
(
set
GLEW_INCLUDE_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
1
.1
%%x
.0\include
set
GLEW_LIBRARY_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
1
.1
%%x
.0\lib\glew32.lib
)
)
:: check for glew version 2.0
if
exist
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
2
.0.0\include
(
set
GLEW_INCLUDE_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
2
.0.0\include
set
GLEW_LIBRARY_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
2
.0.0\lib\glew32.lib
)
:: check for qwt version 6.1.1 to 6.1.3 use the highest found version
for
/l
%%x
in
(
0
,
1
,
3
)
do
(
if
exist
%LIBPATH_BASE%
\
%ARCHITECTURE%
\qwt
-
6
.1.
%%x
-qt
%QT_REV_LONG%
\include
(
...
...
@@ -104,4 +90,4 @@ for /l %%x in (0, 1, 3) do (
)
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-D
GLEW
_INCLUDE_DIR
=
"
%GLEW_INCLUDE_DIR%
"
-DGLEW
_LIBRARY
=
"
%GLEW_LIBRARY_DIR%
"
-D
QWT
6
_INCLUDE_DIR
=
%QWT6
_INCLUDE_DIR
%
-DQWT
6
_LIBRARY
=
%QWT6
_LIBRARY
%
-DQWT
6
_LIBRARY_DIR
=
%QWT6
_LIBRARY_DIR
%
-DCMAKE
_WINDOWS_LIBS_DIR
=
%CMAKE_WINDOWS_LIBS_DIR%
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-DQWT
6
_INCLUDE_DIR
=
%QWT6
_INCLUDE_DIR
%
-DQWT
6
_LIBRARY
=
%QWT6
_LIBRARY
%
-DQWT
6
_LIBRARY_DIR
=
%QWT6
_LIBRARY_DIR
%
-DCMAKE
_WINDOWS_LIBS_DIR
=
%CMAKE_WINDOWS_LIBS_DIR%
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