Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenVolumeMesh
OpenVolumeMesh
Commits
2b9d0a80
Commit
2b9d0a80
authored
Jul 05, 2019
by
Martin Heistermann
Browse files
Fix windows unittests.
parent
33dc3331
Pipeline
#11802
passed with stage
in 4 minutes and 55 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CI/Windows.bat
View file @
2b9d0a80
...
...
@@ -45,9 +45,13 @@ ECHO "LIBPATH : %LIBPATH%"
ECHO
"==============================================================="
ECHO
"==============================================================="
set
GTEST_PREFIX
=
%LIBPATH%
\
%ARCHITECTURE%
\
%GTESTVERSION%
set
GTEST_INCLUDE_DIR
=
%GTEST_PREFIX%
\include
set
GTEST_LIBRARY
=
%GTEST_PREFIX%
\lib\gtest.lib
set
GTEST_MAIN_LIBRARY
=
%GTEST_PREFIX%
\lib\gtest_main.lib
"C:\Program Files\CMake\bin\cmake.exe"
-DGTEST
_
PREFIX
=
"
%LIBPATH%
\
%ARCHITECTURE%
\
%GTESTVERSION
%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Release
%CMAKE_CONFIGURATION%
..
"C:\Program Files\CMake\bin\cmake.exe"
-DGTEST
_
LIBRARY
=
"
%GTEST_LIBRARY%
"
-DGTEST
_INCLUDE_DIR
=
"
%GTEST_INCLUDE_DIR%
"
-DGTEST
_MAIN_LIBRARY
=
"
%GTEST_MAIN_LIBRARY
%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Release
%CMAKE_CONFIGURATION%
..
%VS_PATH%
/Build
"Release"
OpenVolumeMesh
.sln
/Project
"ALL_BUILD"
...
...
@@ -57,7 +61,7 @@ cd ..
cd
src
\Unittests\TestFiles
..\..\..\build
-release
\
src\
Unittests\Release\unittests.exe
..\..\..\build
-release
\Unittests\Release\unittests.exe
cd
..\..\..\
...
...
@@ -68,7 +72,10 @@ mkdir build-debug
cd
build
-debug
"C:\Program Files\CMake\bin\cmake.exe"
-DGTEST
_PREFIX
=
"
%LIBPATH%
\
%ARCHITECTURE%
\
%GTESTVERSION%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Debug
%CMAKE_CONFIGURATION%
..
set
GTEST_LIBRARY
=
%GTEST_PREFIX%
\lib\gtestd.lib
set
GTEST_MAIN_LIBRARY
=
%GTEST_PREFIX%
\lib\gtest_maind.lib
"C:\Program Files\CMake\bin\cmake.exe"
-DGTEST
_LIBRARY
=
"
%GTEST_LIBRARY%
"
-DGTEST
_INCLUDE_DIR
=
"
%GTEST_INCLUDE_DIR%
"
-DGTEST
_MAIN_LIBRARY
=
"
%GTEST_MAIN_LIBRARY%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Debug
%CMAKE_CONFIGURATION%
..
%VS_PATH%
/Build
"Debug"
OpenVolumeMesh
.sln
/Project
"ALL_BUILD"
...
...
@@ -78,7 +85,7 @@ cd ..
cd
src
\Unittests\TestFiles
..\..\..\build
-debug
\
src\
Unittests\Debug\unittests.exe
..\..\..\build
-debug
\Unittests\Debug\unittests.exe
IF
%errorlevel%
NEQ
0
exit
/b
%errorlevel%
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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