Updated CI scripts 10.
This commit is contained in:
parent
79b8dfce38
commit
c62069f476
2 changed files with 12 additions and 9 deletions
|
@ -22,18 +22,19 @@ echo.
|
||||||
|
|
||||||
mkdir build-x64
|
mkdir build-x64
|
||||||
cd build-x64
|
cd build-x64
|
||||||
|
setlocal
|
||||||
|
|
||||||
|
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
|
||||||
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
||||||
setlocal
|
|
||||||
set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
|
|
||||||
cmake ^
|
cmake ^
|
||||||
-G "%CMAKE_GENERATOR%" ^
|
-G "%CMAKE_GENERATOR%" ^
|
||||||
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
|
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
|
||||||
..
|
..
|
||||||
cmake --build .
|
cmake --build .
|
||||||
endlocal
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
endlocal
|
||||||
|
|
||||||
if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
|
if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
|
||||||
cmake ^
|
cmake ^
|
||||||
-G "%CMAKE_GENERATOR%" ^
|
-G "%CMAKE_GENERATOR%" ^
|
||||||
|
@ -52,18 +53,19 @@ echo.
|
||||||
|
|
||||||
mkdir build-x86
|
mkdir build-x86
|
||||||
cd build-x86
|
cd build-x86
|
||||||
|
setlocal
|
||||||
|
|
||||||
|
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set PATH=C:\msys64\mingw32\bin;C:\msys64\usr\bin;%PATH%
|
||||||
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
||||||
setlocal
|
|
||||||
set PATH=C:\msys64\mingw32\bin;C:\msys64\usr\bin;"%PATH%"
|
|
||||||
cmake ^
|
cmake ^
|
||||||
-G "%CMAKE_GENERATOR%" ^
|
-G "%CMAKE_GENERATOR%" ^
|
||||||
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
|
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
|
||||||
..
|
..
|
||||||
cmake --build .
|
cmake --build .
|
||||||
endlocal
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
endlocal
|
||||||
|
|
||||||
if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
|
if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
|
||||||
cmake ^
|
cmake ^
|
||||||
-G "%CMAKE_GENERATOR%" ^
|
-G "%CMAKE_GENERATOR%" ^
|
||||||
|
|
|
@ -18,10 +18,10 @@ REM Web-Site: http://webcamoid.github.io/
|
||||||
|
|
||||||
rem Installing various utilities
|
rem Installing various utilities
|
||||||
choco install -y jfrog-cli
|
choco install -y jfrog-cli
|
||||||
|
setlocal
|
||||||
|
|
||||||
|
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set PATH=C:\msys64\usr\bin;%PATH%
|
||||||
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
||||||
setlocal
|
|
||||||
set PATH=C:\msys64\usr\bin;%PATH%
|
|
||||||
pacman -Syy
|
pacman -Syy
|
||||||
pacman --noconfirm --needed -S ^
|
pacman --noconfirm --needed -S ^
|
||||||
cmake ^
|
cmake ^
|
||||||
|
@ -33,5 +33,6 @@ if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
||||||
mingw-w64-i686-cmake ^
|
mingw-w64-i686-cmake ^
|
||||||
mingw-w64-x86_64-pkg-config ^
|
mingw-w64-x86_64-pkg-config ^
|
||||||
mingw-w64-i686-pkg-config
|
mingw-w64-i686-pkg-config
|
||||||
endlocal
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
endlocal
|
||||||
|
|
Loading…
Reference in a new issue