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
c73b5ac1
Commit
c73b5ac1
authored
Jul 31, 2017
by
Jan Möbius
Browse files
Second fix
parent
1a666c64
Changes
1
Hide whitespace changes
Inline
Side-by-side
CI/Windows.bat
View file @
c73b5ac1
...
...
@@ -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
)
)
...
...
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