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
5b9cc4e7
Commit
5b9cc4e7
authored
Jun 19, 2017
by
Martin Schultz
Browse files
fixed whitespace in windows ci script
added qwt path to ci script
parent
b0fa7f6a
Pipeline
#5285
failed with stage
in 60 minutes and 5 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CI/ci-windows.bat
View file @
5b9cc4e7
...
...
@@ -40,7 +40,7 @@ set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio %VS_COMPILERVERSION_
:: determine Qt Version and set variables
if
"
%QT_VERSION%
"
==
"Qt5.6.2"
(
set
QT_REV
=
5
.6
set
QT_REV
=
5
.6
)
set
QT_SUFFIX
=
...
...
@@ -53,8 +53,13 @@ set GLUT_INCLUDE_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\freeglut-3.0.0\include
set
GLUT_GLUT_LIBRARY
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\freeglut
-
3
.0.0\lib\freeglut.lib
set
GLEW_INCLUDE_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
1
.13.0\include
set
GLEW_LIBRARY_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
1
.13.0\lib\glew32.lib
set
QWT6_INCLUDE_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\qwt
-
6
.1.3
-qt
%QT_VERSION%
\include
set
QWT6_LIBRARY
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\qwt
-
6
.1.3
-qt
%QT_VERSION%
\lib\qwt.lib
:: set QWT6_LIBRARY_RELEASE=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.3-qt%QT_VERSION%\lib\qwt.lib
:: set QWT6_LIBRARY_DEBUG=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.3-qt%QT_VERSION%\lib\qwtd.lib
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-DGLUT
_INCLUDE_DIR
=
"
%GLUT_INCLUDE_DIR%
"
-DGLUT
_glut_LIBRARY
=
"
%GLUT_GLUT_LIBRARY%
"
-DGLEW
_INCLUDE_DIR
=
"
%GLEW_INCLUDE_DIR%
"
-DGLEW
_LIBRARY
=
"
%GLEW_LIBRARY_DIR%
"
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-DGLUT
_INCLUDE_DIR
=
"
%GLUT_INCLUDE_DIR%
"
-DGLUT
_glut_LIBRARY
=
"
%GLUT_GLUT_LIBRARY%
"
-DGLEW
_INCLUDE_DIR
=
"
%GLEW_INCLUDE_DIR%
"
-DGLEW
_LIBRARY
=
"
%GLEW_LIBRARY_DIR%
"
-DQWT
6
_INCLUDE_DIR
=
%QWT6
_INCLUDE_DIR
%
-DQWT
6
_LIBRARY
=
%QWT6
_LIBRARY
%
"C:\Program Files (x86)\CMake\bin\cmake.exe"
-DGTEST
_PREFIX
=
"
%LIBPATH_BASE%
\
%ARCHITECTURE%
\
%GTESTVERSION%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Release
-DOPENFLIPPER
_BUILD_UNIT_TESTS
=
TRUE
%CMAKE_CONFIGURATION%
..
...
...
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