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
CoMISo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
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
CoMISo
CoMISo
Commits
396d2622
Commit
396d2622
authored
Aug 29, 2017
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Windows.bat
parent
0b987824
Pipeline
#5633
passed with stages
in 7 minutes and 15 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
CI/Windows.bat
CI/Windows.bat
+3
-3
No files found.
CI/Windows.bat
View file @
396d2622
...
...
@@ -31,7 +31,7 @@ IF "%QT_VERSION%" == "Qt5.5.1" (
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"
...
...
@@ -47,7 +47,7 @@ IF "%BUILD_PLATFORM%" == "VS2013" (
)
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"
...
...
@@ -56,7 +56,7 @@ IF "%BUILD_PLATFORM%" == "VS2015" (
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-DGLUT
_INCLUDE_DIR
=
"
%LIBPATH%
\
%ARCHITECTURE%
\freeglut-2.8.1\include"
-DGLUT
_glut_LIBRARY
=
"
%LIBPATH%
\
%ARCHITECTURE%
\freeglut-2.8.1\lib\freeglut.lib"
-DGLEW
_INCLUDE_DIR
=
"
%LIBPATH%
\
%ARCHITECTURE%
\glew-1.10.0\include"
-DGLEW
_LIBRARY
=
"
%LIBPATH%
\
%ARCHITECTURE%
\glew-1.10.0\lib\glew32.lib"
-DBOOST
_ROOT
=
"
%LIBPATH%
/
%ARCHITECTURE%
/boost_1_59_0"
-DBOOST
_LIBRARYDIR
=
"
%LIBPATH%
/
%ARCHITECTURE%
/boost_1_59_0/lib64-msvc-12.0"
-DCGAL
_INCLUDE_DIR
=
"
%LIBPATH%
/
%ARCHITECTURE%
/CGAL-4.7/include"
-DCGAL
_LIBRARY_DIR
=
"
%LIBPATH%
/
%ARCHITECTURE%
/CGAL-4.7/lib"
-DCGAL
_BIN_DIR
=
"
%LIBPATH%
/
%ARCHITECTURE%
/CGAL-4.7/bin"
-DMUMPS
_INCLUDE_DIR
=
"
%LIBPATH%
/
%ARCHITECTURE%
/Ipopt-3.11.9/Ipopt/MSVisualStudio/v8-ifort/installed/include"
-DMUMPS
_LIBRARY
=
"
%LIBPATH%
/
%ARCHITECTURE%
/Ipopt-3.11.9/Ipopt/MSVisualStudio/v8-ifort/installed/lib/CoinMumpsC.lib"
"C:\Program Files (x86)\CMake\bin\cmake.exe"
-DBOOST
_ROOT
=
"
%LIBPATH_BASE%
/
%ARCHITECTURE%
/boost_1_59_0"
-DBOOST
_LIBRARYDIR
=
"
%LIBPATH_BASE%
/
%ARCHITECTURE%
/boost_1_59_0/lib64-msvc-12.0"
-DGTEST
_PREFIX
=
"
%LIBPATH%
\
%ARCHITECTURE%
\
%GTESTVERSION%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Release
-DOPENFLIPPER
_BUILD_UNIT_TESTS
=
TRUE
-DCMAKE
_WINDOWS_LIBS_DIR
=
%CMAKE_WINDOWS_LIBS_DIR%
%CMAKE_CONFIGURATION%
..
"C:\Program Files (x86)\CMake\bin\cmake.exe"
-DGTEST
_PREFIX
=
"
%LIBPATH%
\
%ARCHITECTURE%
\
%GTESTVERSION%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Release
-DOPENFLIPPER
_BUILD_UNIT_TESTS
=
TRUE
-DCMAKE
_WINDOWS_LIBS_DIR
=
%CMAKE_WINDOWS_LIBS_DIR%
%CMAKE_CONFIGURATION%
..
IF
%errorlevel%
NEQ
0
exit
/b
%errorlevel%
...
...
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