From be4313ddbec6428d073fe92a96567f9ae3bbe036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=98=99=E2=97=A6=20The=20Tablet=20=E2=9D=80=20GamerGirla?= =?UTF-8?q?ndCo=20=E2=97=A6=E2=9D=A7?= Date: Sat, 17 Jan 2026 01:58:13 -0500 Subject: [PATCH] build: use `FetchContent` to locate `minhook` instead of vcpkg --- CMakeLists.txt | 3 ++- framework/CMakeLists.txt | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f036069..9355017 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ endif() option(TOON_BOOM_EXTENSION_FRAMEWORK_DEBUG "Enable debug output" ON) -include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake) +# include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake) list(APPEND CMAKE_PREFIX_PATH ${QT6_ROOT_DIR}) set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -33,5 +33,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") find_package(Qt6 REQUIRED COMPONENTS Widgets Core Gui Core5Compat Xml QUIET) + add_subdirectory(framework) add_subdirectory(injector) \ No newline at end of file diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index a7d0ffe..30f9e6e 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt @@ -1,3 +1,14 @@ +include(FetchContent) + +FetchContent_Declare( + minhook + GIT_REPOSITORY https://github.com/TsudaKageyu/minhook.git + GIT_TAG master + FIND_PACKAGE_ARGS NAMES minhook +) +FetchContent_MakeAvailable(minhook) + + file(GLOB_RECURSE FRAMEWORK_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.c" "${CMAKE_CURRENT_SOURCE_DIR}/*.cc" @@ -17,7 +28,7 @@ file(GLOB_RECURSE FRAMEWORK_HEADERS CONFIGURE_DEPENDS list(FILTER FRAMEWORK_SOURCES EXCLUDE REGEX "/(out|build|cmake-build-|CMakeFiles)/") file(COPY "${QT5_ROOT_DIR}/include/QtScript" DESTINATION ${CMAKE_BINARY_DIR}/include) -find_package(minhook CONFIG REQUIRED) +# find_package(minhook CONFIG REQUIRED) function(link_libs_and_set_properties target_name) if(TOON_BOOM_EXTENSION_FRAMEWORK_DEBUG) target_compile_definitions(${target_name} PUBLIC TB_EXT_FRAMEWORK_DEBUG=1) @@ -42,7 +53,7 @@ function(link_libs_and_set_properties target_name) target_link_libraries(${target_name} PUBLIC "${QT6_ROOT_DIR}/lib/Qt6Core5Compat.lib") target_link_libraries(${target_name} PUBLIC "${QT6_ROOT_DIR}/lib/Qt6Xml.lib") target_compile_options(${target_name} PUBLIC "/EHsc") - target_link_libraries(${target_name} PUBLIC minhook::minhook) + target_link_libraries(${target_name} PUBLIC minhook) set_target_properties(${target_name} PROPERTIES AUTOMOC ON AUTOUIC ON