Updated CI scripts 10.

This commit is contained in:
Gonzalo Exequiel Pedone 2021-02-21 02:49:41 -03:00
parent 79b8dfce38
commit c62069f476
No known key found for this signature in database
GPG key ID: B8B09E63E9B85BAF
2 changed files with 12 additions and 9 deletions

View file

@ -22,18 +22,19 @@ echo.
mkdir build-x64
cd build-x64
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
setlocal
set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
cmake ^
-G "%CMAKE_GENERATOR%" ^
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
..
cmake --build .
endlocal
)
endlocal
if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
cmake ^
-G "%CMAKE_GENERATOR%" ^
@ -52,18 +53,19 @@ echo.
mkdir build-x86
cd build-x86
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
setlocal
set PATH=C:\msys64\mingw32\bin;C:\msys64\usr\bin;"%PATH%"
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set PATH=C:\msys64\mingw32\bin;C:\msys64\usr\bin;%PATH%
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
cmake ^
-G "%CMAKE_GENERATOR%" ^
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
..
cmake --build .
endlocal
)
endlocal
if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
cmake ^
-G "%CMAKE_GENERATOR%" ^

View file

@ -18,10 +18,10 @@ REM Web-Site: http://webcamoid.github.io/
rem Installing various utilities
choco install -y jfrog-cli
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
setlocal
set PATH=C:\msys64\usr\bin;%PATH%
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set PATH=C:\msys64\usr\bin;%PATH%
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
pacman -Syy
pacman --noconfirm --needed -S ^
cmake ^
@ -33,5 +33,6 @@ if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
mingw-w64-i686-cmake ^
mingw-w64-x86_64-pkg-config ^
mingw-w64-i686-pkg-config
endlocal
)
endlocal