diff --git a/.github/workflows/main-cmake.yml b/.github/workflows/main-cmake.yml index 37d441d6c4e..ca6625a929c 100644 --- a/.github/workflows/main-cmake.yml +++ b/.github/workflows/main-cmake.yml @@ -60,7 +60,7 @@ jobs: parallel: OFF mirror_vfd: OFF direct_vfd: OFF - ros3_vfd: OFF + ros3_vfd: ON generator: "-G \"Visual Studio 17 2022\" -A x64" run_tests: true @@ -153,6 +153,7 @@ jobs: # Set these environment variables so CMake picks the correct compiler echo "CXX=cl.exe" >> $GITHUB_ENV echo "CC=cl.exe" >> $GITHUB_ENV + vcpkg install curl[openssl] if: matrix.os == 'windows-latest' # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it @@ -162,6 +163,9 @@ jobs: # CMAKE CONFIGURE - name: CMake Configure run: | + if [[ "$OS" == "Windows_NT" ]]; then + export CMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" + fi mkdir "${{ runner.workspace }}/build" cd "${{ runner.workspace }}/build" cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \ @@ -192,6 +196,9 @@ jobs: - name: CMake Configure (Thread-Safe) run: | + if [[ "$OS" == "Windows_NT" ]]; then + export CMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" + fi mkdir "${{ runner.workspace }}/build" cd "${{ runner.workspace }}/build" cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \ @@ -223,6 +230,9 @@ jobs: - name: CMake Configure (Concurrency) run: | + if [[ "$OS" == "Windows_NT" ]]; then + export CMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" + fi mkdir "${{ runner.workspace }}/build" cd "${{ runner.workspace }}/build" cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \