Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg] Hotfix regression in #12523 #13092

Merged
merged 1 commit into from
Aug 23, 2020

Conversation

ras0219
Copy link
Contributor

@ras0219 ras0219 commented Aug 23, 2020

PR #12523 causes cmake to pass --x-manifest-dir=/path/to/source/vcpkg.json to vcpkg, which then fails to load /path/to/source/vcpkg.json/vcpkg.json. This reverts that regression.

Without this patch:

1> Working directory: C:\src\mlcard\out\build\x64-Release
1> [CMake] -- Running vcpkg install
1> [CMake] Failed to read manifest C:\src\mlcard\vcpkg.json\vcpkg.json: no such file or directory
1> [CMake] CMake Error at C:/src/vcpkg/scripts/buildsystems/vcpkg.cmake:337 (message):
1> [CMake]   Running vcpkg install - failed
1> [CMake] Call Stack (most recent call first):
1> [CMake]   out/build/x64-Release/CMakeFiles/3.17.20032601-MSVC_2/CMakeSystem.cmake:6 (include)
1> [CMake]   CMakeLists.txt:10 (project)

With this patch:

1> Working directory: C:\src\mlcard\out\build\x64-Release
1> [CMake] -- Running vcpkg install
1> [CMake] Your feedback is important to improve Vcpkg! Please take 3 minutes to complete our survey by running: vcpkg contact --survey
1> [CMake] Detecting compiler hash for triplet x64-windows-static...
1> [CMake] All requested packages are currently installed.

This should have an end-to-end test associated with it, ideally implemented in https://github.com/microsoft/vcpkg/blob/master/scripts/azure-pipelines/end-to-end-tests.ps1, however this PR is limited to just the hotfix.

@strega-nil

@strega-nil strega-nil merged commit e96e74f into microsoft:master Aug 23, 2020
remz1337 pushed a commit to remz1337/vcpkg that referenced this pull request Aug 23, 2020
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants