mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 02:48:58 +08:00
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 9898f424..8cba0e96 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -54,8 +54,7 @@ set(ZYDIS_ZYCORE_PATH
|
||
|
|
# =============================================================================================== #
|
||
|
|
|
||
|
|
# Try to initialize the Zycore submodule using Git
|
||
|
|
-if (NOT EXISTS "${ZYDIS_ZYCORE_PATH}/CMakeLists.txt" AND
|
||
|
|
- "${ZYDIS_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(
|
||
|
|
@@ -65,7 +64,7 @@ if (NOT EXISTS "${ZYDIS_ZYCORE_PATH}/CMakeLists.txt" AND
|
||
|
|
endif()
|
||
|
|
endif ()
|
||
|
|
|
||
|
|
-if (NOT EXISTS "${ZYDIS_ZYCORE_PATH}/CMakeLists.txt")
|
||
|
|
+if (0)
|
||
|
|
message(
|
||
|
|
FATAL_ERROR
|
||
|
|
"Can't find zycore submodule. Please make sure to clone the repo recursively.\n"
|
||
|
|
@@ -77,7 +76,7 @@ if (NOT EXISTS "${ZYDIS_ZYCORE_PATH}/CMakeLists.txt")
|
||
|
|
)
|
||
|
|
endif ()
|
||
|
|
|
||
|
|
-add_subdirectory(${ZYDIS_ZYCORE_PATH} "zycore" EXCLUDE_FROM_ALL)
|
||
|
|
+find_package(zycore CONFIG REQUIRED)
|
||
|
|
|
||
|
|
# =============================================================================================== #
|
||
|
|
# Library configuration #
|
||
|
|
@@ -89,7 +88,7 @@ else ()
|
||
|
|
add_library("Zydis" STATIC)
|
||
|
|
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>
|