Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenMesh
OpenMesh
Commits
bcf0136e
Commit
bcf0136e
authored
Oct 26, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Removed VS2012
- Added checks for Libpath and QT5 install path
parent
8c6cb2b6
Pipeline
#7685
failed with stage
in 59 minutes and 32 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
16 deletions
+19
-16
CI/Windows.bat
CI/Windows.bat
+19
-16
No files found.
CI/Windows.bat
View file @
bcf0136e
...
...
@@ -16,22 +16,6 @@ IF "%SHARED%" == "TRUE" (
set
STRING_DLL
=
)
IF
"
%BUILD_PLATFORM%
"
==
"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"
IF
"
%ARCHITECTURE%
"
==
"x64"
(
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
=
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
=
E
:\libs\VS2013
set
GTESTVERSION
=
gtest
-
1
.6.0
...
...
@@ -95,6 +79,9 @@ IF "%APPS%" == "ON" (
set
CMAKE_CONFIGURATION
=
)
ECHO
"============================================================="
ECHO
"============================================================="
ECHO
"Building with :"
...
...
@@ -111,7 +98,23 @@ ECHO "QT_INSTALL_PATH : %QT_INSTALL_PATH%"
ECHO
"CMAKE_CONFIGURATION :
%CMAKE_CONFIGURATION%
"
ECHO
"============================================================="
ECHO
"============================================================="
ECHO
""
ECHO
"Running Build environment checks"
IF
EXIST
%LIBPATH%
\
(
ECHO
"LIBPATH ... Ok"
)
ELSE
(
ECHO
"LIBPATH not found
!
"
exit
10
;
)
IF
EXIST
%QT_INSTALL_PATH%
\
(
ECHO
"QT_INSTALL_PATH ... Ok"
)
ELSE
(
ECHO
"QT_INSTALL_PATH not found
!
"
exit
10
;
)
"C:\Program Files\CMake\bin\cmake.exe"
-DGTEST
_PREFIX
=
"
%LIBPATH%
\
%ARCHITECTURE%
\
%GTESTVERSION%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Release
-DBUILD
_APPS
=
%APPS%
-DOPENMESH
_BUILD_UNIT_TESTS
=
TRUE
-DCMAKE
_WINDOWS_LIBS_DIR
=
"e:\libs"
-DOPENMESH
_BUILD_SHARED
=
%SHARED%
%CMAKE_CONFIGURATION%
..
...
...
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