Updated CI scripts 4.
This commit is contained in:
parent
db1b34e611
commit
dab84ce423
2 changed files with 7 additions and 7 deletions
|
@ -20,12 +20,12 @@ echo.
|
||||||
echo Building x64 virtual camera driver
|
echo Building x64 virtual camera driver
|
||||||
echo.
|
echo.
|
||||||
|
|
||||||
set PATH_ORIG=%Path%
|
set PATH_ORIG=%PATH%
|
||||||
mkdir build-x64
|
mkdir build-x64
|
||||||
cd build-x64
|
cd build-x64
|
||||||
|
|
||||||
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
||||||
set Path=C:\msys64\mingw64\bin;C:\msys64\usr\bin;"%Path%"
|
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%" ^
|
||||||
|
@ -33,7 +33,7 @@ if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
||||||
)
|
)
|
||||||
|
|
||||||
if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
|
if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
|
||||||
set Path="C:\Program Files\CMake\bin;%Path%"
|
set PATH="C:\Program Files\CMake\bin;%PATH%"
|
||||||
cmake ^
|
cmake ^
|
||||||
-G "%CMAKE_GENERATOR%" ^
|
-G "%CMAKE_GENERATOR%" ^
|
||||||
-A x64 ^
|
-A x64 ^
|
||||||
|
@ -48,12 +48,12 @@ echo.
|
||||||
echo Building x86 virtual camera driver
|
echo Building x86 virtual camera driver
|
||||||
echo.
|
echo.
|
||||||
|
|
||||||
set Path=%PATH_ORIG%
|
set PATH=%PATH_ORIG%
|
||||||
mkdir build-x86
|
mkdir build-x86
|
||||||
cd build-x86
|
cd build-x86
|
||||||
|
|
||||||
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
||||||
set Path=C:\msys64\mingw32\bin;C:\msys64\usr\bin;"%Path%"
|
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%" ^
|
||||||
|
@ -61,7 +61,7 @@ if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
||||||
)
|
)
|
||||||
|
|
||||||
if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
|
if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
|
||||||
set Path="C:\Program Files\CMake\bin;%Path%"
|
set PATH="C:\Program Files\CMake\bin;%PATH%"
|
||||||
cmake ^
|
cmake ^
|
||||||
-G "%CMAKE_GENERATOR%" ^
|
-G "%CMAKE_GENERATOR%" ^
|
||||||
-A Win32 ^
|
-A Win32 ^
|
||||||
|
|
|
@ -20,7 +20,7 @@ rem Installing various utilities
|
||||||
choco install -y jfrog-cli
|
choco install -y jfrog-cli
|
||||||
|
|
||||||
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
|
||||||
set Path=C:\msys64\usr\bin;"%Path%"
|
set PATH=C:\msys64\usr\bin;"%PATH%"
|
||||||
pacman -Syy
|
pacman -Syy
|
||||||
pacman --noconfirm --needed -S ^
|
pacman --noconfirm --needed -S ^
|
||||||
cmake ^
|
cmake ^
|
||||||
|
|
Loading…
Reference in a new issue