-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[zydis] Update version to v4.1.0 (#39037)
Fix #38691 - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file.
- Loading branch information
1 parent
c986993
commit c4451fd
Showing
5 changed files
with
27 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,66 +1,14 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 5e812fb..64c6e97 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -78,8 +78,7 @@ if (ZYAN_SYSTEM_ZYCORE) | ||
| find_package(Zycore) | ||
| else () | ||
| # Try to initialize the Zycore submodule using Git | ||
| - if (NOT EXISTS "${ZYAN_ZYCORE_PATH}/CMakeLists.txt" AND | ||
| - "${ZYAN_ZYCORE_PATH}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}/dependencies/zycore") | ||
| + if (0) | ||
| find_package(Git QUIET) | ||
| if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") | ||
| execute_process( | ||
| @@ -89,7 +88,7 @@ else () | ||
| endif() | ||
| endif () | ||
|
|
||
| - if (NOT EXISTS "${ZYAN_ZYCORE_PATH}/CMakeLists.txt") | ||
| + if (0) | ||
| message( | ||
| FATAL_ERROR | ||
| "Can't find zycore submodule. Please make sure to clone the repo recursively.\n" | ||
| @@ -101,7 +100,7 @@ else () | ||
| ) | ||
| endif () | ||
|
|
||
| - add_subdirectory(${ZYAN_ZYCORE_PATH} "zycore" EXCLUDE_FROM_ALL) | ||
| + find_package(zycore CONFIG REQUIRED) | ||
| endif () | ||
|
|
||
| # =============================================================================================== # | ||
| @@ -115,7 +114,7 @@ else () | ||
| target_compile_definitions("Zydis" PUBLIC "ZYDIS_STATIC_BUILD") | ||
| endif () | ||
|
|
||
| -target_link_libraries("Zydis" PUBLIC "Zycore") | ||
| +target_link_libraries("Zydis" PUBLIC Zycore::Zycore) | ||
| target_include_directories("Zydis" | ||
| PUBLIC | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
| @@ -383,14 +382,16 @@ if (ZYDIS_BUILD_TOOLS AND NOT ZYAN_NO_LIBC) | ||
| target_compile_definitions("ZydisFuzzReEncoding" PRIVATE "ZYDIS_LIBFUZZER") | ||
| endif () | ||
|
|
||
| - add_executable("ZydisTestEncoderAbsolute" | ||
| - "tools/ZydisTestEncoderAbsolute.c") | ||
| - target_link_libraries("ZydisTestEncoderAbsolute" "Zydis") | ||
| - set_target_properties("ZydisTestEncoderAbsolute" PROPERTIES FOLDER "Tools") | ||
| - target_compile_definitions("ZydisTestEncoderAbsolute" PRIVATE "_CRT_SECURE_NO_WARNINGS") | ||
| - zyan_set_common_flags("ZydisTestEncoderAbsolute") | ||
| - zyan_maybe_enable_wpo("ZydisTestEncoderAbsolute") | ||
| - _maybe_set_emscripten_cfg("ZydisTestEncoderAbsolute") | ||
| + if (NOT ZYDIS_BUILD_SHARED_LIB) | ||
| + add_executable("ZydisTestEncoderAbsolute" | ||
| + "tools/ZydisTestEncoderAbsolute.c") | ||
| + target_link_libraries("ZydisTestEncoderAbsolute" "Zydis") | ||
| + set_target_properties("ZydisTestEncoderAbsolute" PROPERTIES FOLDER "Tools") | ||
| + target_compile_definitions("ZydisTestEncoderAbsolute" PRIVATE "_CRT_SECURE_NO_WARNINGS") | ||
| + zyan_set_common_flags("ZydisTestEncoderAbsolute") | ||
| + zyan_maybe_enable_wpo("ZydisTestEncoderAbsolute") | ||
| + _maybe_set_emscripten_cfg("ZydisTestEncoderAbsolute") | ||
| + endif () | ||
| endif () | ||
|
|
||
| add_executable("ZydisInfo" "tools/ZydisInfo.c") | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 62d5de6..ee500c7 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -138,7 +138,8 @@ function (locate_zycore) | ||
| ) | ||
| endfunction () | ||
|
|
||
| -locate_zycore() | ||
| +find_package(zycore CONFIG REQUIRED) | ||
| +add_library(Zycore ALIAS Zycore::Zycore) | ||
|
|
||
| # =============================================================================================== # | ||
| # Library configuration # |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters