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
OpenMesh
OpenMesh
Commits
d563cdac
Commit
d563cdac
authored
Apr 17, 2018
by
Jan Möbius
Browse files
Merge branch 'VS2017' into 'master'
Vs2017 CI builds See merge request
!164
parents
c9531487
83336373
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
d563cdac
...
...
@@ -44,6 +44,115 @@ cppcheck:
paths
:
-
cppcheck.log
.VS2015-64-bit-shared-apps
:
variables
:
BUILD_PLATFORM
:
"
VS2015"
ARCHITECTURE
:
"
x64"
SHARED
:
"
TRUE"
APPS
:
"
ON"
script
:
"
CI
\\
Windows.bat"
tags
:
-
VS2015
artifacts
:
paths
:
-
build-release/*.exe
.VS2015-32-bit-shared-apps
:
variables
:
BUILD_PLATFORM
:
"
VS2015"
ARCHITECTURE
:
"
x32"
SHARED
:
"
TRUE"
APPS
:
"
ON"
script
:
"
CI
\\
Windows.bat"
tags
:
-
VS2015
artifacts
:
paths
:
-
build-release/*.exe
.VS2015-64-bit-static-apps
:
variables
:
BUILD_PLATFORM
:
"
VS2015"
ARCHITECTURE
:
"
x64"
SHARED
:
"
FALSE"
APPS
:
"
ON"
script
:
"
CI
\\
Windows.bat"
tags
:
-
VS2015
artifacts
:
paths
:
-
build-release/*.exe
.VS2015-32-bit-static-apps
:
variables
:
BUILD_PLATFORM
:
"
VS2015"
ARCHITECTURE
:
"
x32"
SHARED
:
"
FALSE"
APPS
:
"
ON"
script
:
"
CI
\\
Windows.bat"
tags
:
-
VS2015
artifacts
:
paths
:
-
build-release/*.exe
VS2017-64-bit-shared-no-apps
:
variables
:
BUILD_PLATFORM
:
"
VS2017"
ARCHITECTURE
:
"
x64"
SHARED
:
"
TRUE"
APPS
:
"
OFF"
script
:
"
CI
\\
Windows.bat"
tags
:
-
VS2017
artifacts
:
paths
:
-
build-release/*.exe
VS2017-32-bit-shared-no-apps
:
variables
:
BUILD_PLATFORM
:
"
VS2017"
ARCHITECTURE
:
"
x32"
SHARED
:
"
TRUE"
APPS
:
"
OFF"
script
:
"
CI
\\
Windows.bat"
tags
:
-
VS2017
artifacts
:
paths
:
-
build-release/*.exe
VS2017-64-bit-static-no-apps
:
variables
:
BUILD_PLATFORM
:
"
VS2017"
ARCHITECTURE
:
"
x64"
SHARED
:
"
FALSE"
APPS
:
"
OFF"
script
:
"
CI
\\
Windows.bat"
tags
:
-
VS2017
artifacts
:
paths
:
-
build-release/*.exe
VS2017-32-bit-static-no-apps
:
variables
:
BUILD_PLATFORM
:
"
VS2017"
ARCHITECTURE
:
"
x32"
SHARED
:
"
FALSE"
APPS
:
"
OFF"
script
:
"
CI
\\
Windows.bat"
tags
:
-
VS2017
artifacts
:
paths
:
-
build-release/*.exe
VS2015-64-bit-shared-apps
:
variables
:
BUILD_PLATFORM
:
"
VS2015"
...
...
@@ -57,6 +166,7 @@ VS2015-64-bit-shared-apps:
paths
:
-
build-release/*.exe
VS2015-64-bit-shared-no-apps
:
variables
:
BUILD_PLATFORM
:
"
VS2015"
...
...
@@ -260,10 +370,3 @@ Doc-publish:
script
:
"
CI/ci-doc.sh"
tags
:
-
Linux
CI/Windows.bat
View file @
d563cdac
...
...
@@ -69,6 +69,20 @@ IF "%BUILD_PLATFORM%" == "VS2015" (
)
IF
"
%BUILD_PLATFORM%
"
==
"VS2017"
(
set
LIBPATH
=
E
:\libs\VS2017
set
GTESTVERSION
=
gtest
-
1
.7.0
set
GENERATOR
=
Visual
Studio
15
%ARCH_VS%
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\devenv.com"
set
QT_VERSION
=
IF
"
%ARCHITECTURE%
"
==
"x64"
(
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.10.1\5.10.1\msvc2017_64
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.10.1\5.10.1\msvc2017_64
)
)
IF
"
%APPS%
"
==
"ON"
(
set
STRING_APPS
=
...
...
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