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
OpenVolumeMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
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
OpenVolumeMesh
OpenVolumeMesh
Commits
d13ed9c3
Commit
d13ed9c3
authored
Dec 12, 2017
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'CI-fix' into 'master'
Fixed CI on Windows Closes
#4
See merge request
!21
parents
859345eb
13e93e29
Pipeline
#5953
passed with stage
in 3 minutes and 51 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
CI/Windows.bat
CI/Windows.bat
+10
-10
No files found.
CI/Windows.bat
View file @
d13ed9c3
...
...
@@ -11,37 +11,37 @@ IF "%ARCHITECTURE%" == "x64" (
)
IF
"
%BUILD_PLATFORM%
"
==
"VS2013"
(
set
LIBPATH
=
C
:\libs\VS2013
set
LIBPATH
=
E
:\libs\VS2013
set
GTESTVERSION
=
gtest
-
1
.6.0
set
GENERATOR
=
Visual
Studio
12
%ARCH_VS%
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com"
set
QT_VERSION
=
IF
"
%ARCHITECTURE%
"
==
"x64"
(
set
QT_INSTALL_PATH
=
C
:\Qt\Qt5.3.1
-vs
2013
-
%STRING_ARCH%
\5.3\msvc2013_64_opengl
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
C
:\Qt\Qt5.3.1
-vs
2013
-
%STRING_ARCH%
\5.3\msvc2013_64_opengl
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.3.1
-vs
2013
-
%STRING_ARCH%
\5.3\msvc2013_64_opengl
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.3.1
-vs
2013
-
%STRING_ARCH%
\5.3\msvc2013_64_opengl
)
IF
"
%ARCHITECTURE%
"
==
"x32"
(
set
QT_INSTALL_PATH
=
C
:\Qt\Qt5.3.1
-vs
2013
-
%STRING_ARCH%
\5.3\msvc2013_opengl
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
C
:\Qt\Qt5.3.1
-vs
2013
-
%STRING_ARCH%
\5.3\msvc2013_opengl
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.3.1
-vs
2013
-
%STRING_ARCH%
\5.3\msvc2013_opengl
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.3.1
-vs
2013
-
%STRING_ARCH%
\5.3\msvc2013_opengl
)
)
IF
"
%BUILD_PLATFORM%
"
==
"VS2015"
(
set
LIBPATH
=
C
:\libs\VS2015
set
LIBPATH
=
E
:\libs\VS2015
set
GTESTVERSION
=
gtest
-
1
.7.0
set
GENERATOR
=
Visual
Studio
14
%ARCH_VS%
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com"
set
QT_VERSION
=
IF
"
%ARCHITECTURE%
"
==
"x64"
(
set
QT_INSTALL_PATH
=
C
:\Qt\Qt5.6.0
-vs
2015
-
%STRING_ARCH%
\5.6\msvc2015_64
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
C
:\Qt\Qt5.6.0
-vs
2015
-
%STRING_ARCH%
\5.6\msvc2015_64
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.6.0
-vs
2015
-
%STRING_ARCH%
\5.6\msvc2015_64
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.6.0
-vs
2015
-
%STRING_ARCH%
\5.6\msvc2015_64
)
IF
"
%ARCHITECTURE%
"
==
"x32"
(
set
QT_INSTALL_PATH
=
C
:\Qt\Qt5.6.0
-vs
2015
-
%STRING_ARCH%
\5.6\msvc2015
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
C
:\Qt\Qt5.6.0
-vs
2015
-
%STRING_ARCH%
\5.6\msvc2015
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.6.0
-vs
2015
-
%STRING_ARCH%
\5.6\msvc2015
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.6.0
-vs
2015
-
%STRING_ARCH%
\5.6\msvc2015
)
)
...
...
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