diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 88e2ee579..32677b392 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -497,6 +497,15 @@ jobs: - name: 'Fix ffmpeg installation' run: choco install ffmpeg + - name: Install cmake 3.21 and set path + run: | + Invoke-WebRequest -Uri "https://github.com/Kitware/CMake/releases/download/v3.21.3/cmake-3.21.3-windows-x86_64.zip" -OutFile "cmake.zip" + Expand-Archive "cmake.zip" -DestinationPath "C:\Program Files\cmake-3.21" + $newPath = "C:\Program Files\cmake-3.21\cmake-3.21.3-windows-x86_64\bin;" + $env:PATH + echo "PATH=$newPath" >> $GITHUB_ENV + Remove-Item cmake.zip + shell: powershell + - name: 'Setup plugings' run: | git stash diff --git a/CI/windows/02_build_obs.ps1 b/CI/windows/02_build_obs.ps1 index ae4a67bfa..13e1afdc3 100644 --- a/CI/windows/02_build_obs.ps1 +++ b/CI/windows/02_build_obs.ps1 @@ -92,9 +92,6 @@ function Configure-OBS { "-DCOPIED_DEPENDENCIES=OFF", "-DCOPY_DEPENDENCIES=ON", "-DBUILD_FOR_DISTRIBUTION=ON", - "-DFFMPEG_DIR:PATH=C:\ProgramData\chocolatey\lib\ffmpeg", - "-DAVCODEC_INCLUDE_DIR:PATH=C:\ProgramData\chocolatey\lib\ffmpeg\include", - "-DAVCODEC_LIBRARY:FILEPATH=C:\ProgramData\chocolatey\lib\ffmpeg\lib\avcodec.lib", "$(if (Test-Path Env:CI) { "-DOBS_BUILD_NUMBER=${Env:GITHUB_RUN_ID}" })", "$(if (Test-Path Variable:$Quiet) { "-Wno-deprecated -Wno-dev --log-level=ERROR" })", "-Dlibwebrtc_DIR=`"C:/Program Files/libwebrtc/cmake`"",