Skip to content

Commit f46a3f8

Browse files
cjvolzkaliqunfu
andauthored
[Cherry-pick] Use CMAKE_PREFIX_PATH in finding libprotobuf (#5975) (#5997)
### Description * Cherry-pick #5975 into `rel-1.16.0` fix find libprotobuf which is suggested by https://gitlab.kitware.com/cmake/cmake/-/issues/25704 ### Motivation and Context * Required so cherry-pick #5986 can pass tests Signed-off-by: Liqun Fu <[email protected]> Co-authored-by: liqun Fu <[email protected]>
1 parent c867683 commit f46a3f8

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

.azure-pipelines/Windows-CI.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,6 @@ jobs:
5656
- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
5757
displayName: Add conda to PATH
5858

59-
# cmake 3.28.3 failed to find protobuf installed from conda-forge
60-
# https://gitlab.kitware.com/cmake/cmake/-/issues/25704
61-
- script: |
62-
choco install cmake --version 3.27.9 -y
63-
cmake --version
64-
displayName: Install specific version of CMake and check version
65-
6659
- script: |
6760
conda create --yes --quiet --name py$(python.version) python=$(python.version)
6861
if '$(protobuf_type)' == 'External' (
@@ -72,6 +65,9 @@ jobs:
7265
)
7366
displayName: Create Anaconda environment
7467
68+
- powershell: echo "##vso[task.setvariable variable=CMAKE_PREFIX_PATH]$env:CONDA/envs/py$(python.version)/Library"
69+
displayName: Set CMAKE_PREFIX_PATH
70+
7571
- script: |
7672
call activate py$(python.version)
7773
python -m pip install --upgrade pip

0 commit comments

Comments
 (0)