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 baseline][zydis, zycore] Fix file conflicts #27249

Merged
merged 3 commits into from
Oct 16, 2022

Conversation

Thomas1664
Copy link
Contributor

Describe the pull request

  • What does your PR fix?

    Zydis used to download zycore instead of using the corresponding port which lead to file conflicts.

OPTIONS -DZYCORE_BUILD_SHARED_LIB=${ZYCORE_BUILD_SHARED}
OPTIONS
-DZYCORE_BUILD_SHARED_LIB=${ZYCORE_BUILD_SHARED}
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
Copy link
Contributor Author

@Thomas1664 Thomas1664 Oct 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See https://github.com/zyantific/zycore-c/blob/v1.3.0/CMakeLists.txt#L221-L229 for the reason why I had to set CMAKE_DISABLE_FIND_PACKAGE_Doxygen.

@vicroms vicroms merged commit 0321a84 into microsoft:master Oct 16, 2022
@Thomas1664 Thomas1664 deleted the zydis branch October 16, 2022 20:54
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.

2 participants