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
OpenMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
11
Issues
11
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
OpenMesh
OpenMesh
Commits
c48e9578
Commit
c48e9578
authored
Jul 31, 2017
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'windows_ci_fix' into 'master'
Windows fix for CI paths See merge request
!140
parents
d3e50aed
c73b5ac1
Pipeline
#5460
passed with stage
in 43 minutes and 46 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
CI/Windows.bat
CI/Windows.bat
+16
-16
No files found.
CI/Windows.bat
View file @
c48e9578
...
...
@@ -17,54 +17,54 @@ IF "%SHARED%" == "TRUE" (
)
IF
"
%BUILD_PLATFORM%
"
==
"VS2012"
(
set
LIBPATH
=
C
:\libs\VS2012
set
LIBPATH
=
E
:\libs\VS2012
set
GTESTVERSION
=
gtest
-
1
.6.0
set
GENERATOR
=
Visual
Studio
11
%ARCH_VS%
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\devenv.com"
set
QT_VERSION
=
IF
"
%ARCHITECTURE%
"
==
"x64"
(
set
QT_INSTALL_PATH
=
C
:\Qt\4.8.5
-vs
2012
-
%STRING_ARCH%
\
set
QT_BASE_CONFIG
=
-DQT
_QMAKE_EXECUTABLE
=
C
:\Qt\4.8.5
-vs
2012
-
%STRING_ARCH%
\bin\qmake.exe
set
QT_INSTALL_PATH
=
E
:\Qt\4.8.5
-vs
2012
-
%STRING_ARCH%
\
set
QT_BASE_CONFIG
=
-DQT
_QMAKE_EXECUTABLE
=
E
:\Qt\4.8.5
-vs
2012
-
%STRING_ARCH%
\bin\qmake.exe
)
IF
"
%ARCHITECTURE%
"
==
"x32"
(
set
QT_INSTALL_PATH
=
C
:\Qt\4.8.5
-vs
2012
-
%STRING_ARCH%
\
set
QT_BASE_CONFIG
=
-DQT
_QMAKE_EXECUTABLE
=
C
:\Qt\4.8.5
-vs
2012
-
%STRING_ARCH%
\bin\qmake.exe
set
QT_INSTALL_PATH
=
E
:\Qt\4.8.5
-vs
2012
-
%STRING_ARCH%
\
set
QT_BASE_CONFIG
=
-DQT
_QMAKE_EXECUTABLE
=
E
:\Qt\4.8.5
-vs
2012
-
%STRING_ARCH%
\bin\qmake.exe
)
)
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
)
)
...
...
@@ -93,7 +93,7 @@ IF "%APPS%" == "ON" (
)
"C:\Program Files (x86)\CMake\bin\cmake.exe"
-DGTEST
_PREFIX
=
"
%LIBPATH%
\
%ARCHITECTURE%
\
%GTESTVERSION%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Release
-DBUILD
_APPS
=
%APPS%
-DOPENMESH
_BUILD_UNIT_TESTS
=
TRUE
-DOPENMESH
_BUILD_SHARED
=
%SHARED%
%CMAKE_CONFIGURATION%
..
"C:\Program Files (x86)\CMake\bin\cmake.exe"
-DGTEST
_PREFIX
=
"
%LIBPATH%
\
%ARCHITECTURE%
\
%GTESTVERSION%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Release
-DBUILD
_APPS
=
%APPS%
-DOPENMESH
_BUILD_UNIT_TESTS
=
TRUE
-D
CMAKE
_WINDOWS_LIBS_DIR
=
"e:\libs"
-D
OPENMESH
_BUILD_SHARED
=
%SHARED%
%CMAKE_CONFIGURATION%
..
%VS_PATH%
/Build
"Release"
OpenMesh
.sln
/Project
"ALL_BUILD"
...
...
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