ci: conanvcvars.bat call fixed

This commit is contained in:
Mateusz Pusz
2022-08-02 09:07:59 +02:00
parent a134d74ca2
commit db6c46ad3a

View File

@@ -205,7 +205,7 @@ jobs:
working-directory: src working-directory: src
run: | run: |
cmake --version cmake --version
..\build\generators\conanbuild.bat call ..\build\generators\conanvcvars.bat
cmake --preset default -DCMAKE_INSTALL_PREFIX=../out cmake --preset default -DCMAKE_INSTALL_PREFIX=../out
- name: Configure mp-units CMake - name: Configure mp-units CMake
if: matrix.config.compiler.type != 'VISUAL' if: matrix.config.compiler.type != 'VISUAL'
@@ -229,7 +229,7 @@ jobs:
shell: cmd shell: cmd
working-directory: test_package working-directory: test_package
run: | run: |
..\build\generators\conanbuild.bat call ..\build\generators\conanvcvars.bat
cmake --preset default -Dmp-units_DIR=../build -Bbuild/local cmake --preset default -Dmp-units_DIR=../build -Bbuild/local
cmake --build build/local --config ${{ matrix.build_type }} cmake --build build/local --config ${{ matrix.build_type }}
- name: Build test_package CMake (local build) - name: Build test_package CMake (local build)
@@ -249,7 +249,7 @@ jobs:
shell: cmd shell: cmd
working-directory: test_package working-directory: test_package
run: | run: |
..\build\generators\conanbuild.bat call ..\build\generators\conanvcvars.bat
cmake --preset default -DCMAKE_INSTALL_PREFIX=../out -Bbuild/install cmake --preset default -DCMAKE_INSTALL_PREFIX=../out -Bbuild/install
cmake --build build/install --config ${{ matrix.build_type }} cmake --build build/install --config ${{ matrix.build_type }}
- name: Build test_package CMake (installation) - name: Build test_package CMake (installation)