diff --git a/CMakeLists.txt b/CMakeLists.txt index 023a348..ee35fdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,10 +32,10 @@ set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}/bin/install) add_compile_options(/MP /permissive-) list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") -include(libzippp) -include(minhook) +find_package(libzippp CONFIG REQUIRED) +find_package(minhook CONFIG REQUIRED) +find_package(Microsoft.GSL CONFIG REQUIRED) include(dxtk) -include(msgsl) add_library(gMod SHARED) @@ -56,9 +56,9 @@ target_compile_options(gMod PRIVATE /W4 /WX) target_link_libraries(gMod PRIVATE dxguid - libzippp + libzippp::libzippp psapi - minhook + minhook::minhook directxtex Microsoft.GSL::GSL ) diff --git a/TpfConvert/CMakeLists.txt b/TpfConvert/CMakeLists.txt index 1891f65..6548fdc 100644 --- a/TpfConvert/CMakeLists.txt +++ b/TpfConvert/CMakeLists.txt @@ -33,7 +33,7 @@ endif() find_package(dxsdk-d3dx CONFIG REQUIRED) target_link_libraries(TpfConvert PRIVATE - libzippp + libzippp::libzippp Microsoft::D3DX9 d3d9 ) diff --git a/cmake/libzip.cmake b/cmake/libzip.cmake deleted file mode 100644 index d5ee320..0000000 --- a/cmake/libzip.cmake +++ /dev/null @@ -1,65 +0,0 @@ -include_guard() -include(FetchContent) -include(zlib) - -FetchContent_Declare( - libzip - GIT_REPOSITORY https://github.com/nih-at/libzip - GIT_TAG v1.10.1) -FetchContent_GetProperties(libzip) - -if (libzip_POPULATED) - message(STATUS "Skipping libzip download") - return() -endif() - -FetchContent_Populate(libzip) -if(EXISTS ${CMAKE_INSTALL_PREFIX}/lib/zip.lib) - message(STATUS "Skipping libzip build") - return() -endif() - -set(OPTIONS - "-A" "Win32" - "-DZLIB_LIBRARY:PATH=${CMAKE_INSTALL_PREFIX}/lib/zlibstatic.lib" - "-DZLIB_INCLUDE_DIR:PATH=${CMAKE_INSTALL_PREFIX}/include" - "-DENABLE_COMMONCRYPTO=OFF" - "-DENABLE_GNUTLS=OFF" - "-DENABLE_MBEDTLS=OFF" - "-DENABLE_OPENSSL=OFF" - "-DENABLE_WINDOWS_CRYPTO=ON" - "-DENABLE_FDOPEN=OFF" - "-DENABLE_BZIP2=OFF" - "-DENABLE_LZMA=OFF" - "-DENABLE_ZSTD=OFF" - "-DBUILD_TOOLS=OFF" - "-DBUILD_REGRESS=OFF" - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_DOC=OFF" - "-DLIBZIP_DO_INSTALL=ON" - "-DBUILD_SHARED_LIBS=OFF" - "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" - "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}" - ) - -message("Building libzip with OPTIONS:\n${OPTIONS}") - -# Patch CMakeLists.txt to require version 3.15 - otherwise cmake ignores MSVC_RUNTIME_LIBRARY -file(READ ${libzip_SOURCE_DIR}/CMakeLists.txt FILE_CONTENT) -string(REPLACE "VERSION 3.5.0" "VERSION 3.15.0" UPDATED_CONTENT "${FILE_CONTENT}") -file(WRITE ${libzip_SOURCE_DIR}/CMakeLists.txt "${UPDATED_CONTENT}") - -execute_process( - COMMAND ${CMAKE_COMMAND} ${OPTIONS} . - WORKING_DIRECTORY ${libzip_SOURCE_DIR} -) -execute_process( - COMMAND ${CMAKE_COMMAND} --build . --config Release - WORKING_DIRECTORY ${libzip_SOURCE_DIR} -) -execute_process( - COMMAND ${CMAKE_COMMAND} --install . --config Release - WORKING_DIRECTORY ${libzip_SOURCE_DIR} -) - -message(STATUS "Finished libzip build") diff --git a/cmake/libzippp.cmake b/cmake/libzippp.cmake deleted file mode 100644 index 3472d13..0000000 --- a/cmake/libzippp.cmake +++ /dev/null @@ -1,42 +0,0 @@ -include_guard() -include(FetchContent) -include(libzip) - -find_library(ZLIB_LIBRARY REQUIRED - NAMES zlibstatic - PATHS ${CMAKE_INSTALL_PREFIX}/lib -) -find_library(LIBZIP_LIBRARY REQUIRED - NAMES zip - PATHS ${CMAKE_INSTALL_PREFIX}/lib -) - -FetchContent_Declare( - libzippp - GIT_REPOSITORY https://github.com/ctabin/libzippp - GIT_TAG libzippp-v7.0-1.10.1) -FetchContent_GetProperties(libzippp) - -if (NOT libzippp_POPULATED) - FetchContent_Populate(libzippp) -endif() - -add_library(libzippp STATIC) - -set(SOURCES - "${libzippp_SOURCE_DIR}/src/libzippp.h" - "${libzippp_SOURCE_DIR}/src/libzippp.cpp" - ) -source_group(TREE ${libzippp_SOURCE_DIR} FILES ${SOURCES}) -target_sources(libzippp PRIVATE ${SOURCES}) -target_include_directories(libzippp PUBLIC "${libzippp_SOURCE_DIR}/src") -target_include_directories(libzippp PRIVATE "${CMAKE_INSTALL_PREFIX}/include") -target_compile_definitions(libzippp PUBLIC - LIBZIPPP_WITH_ENCRYPTION - ) -target_link_libraries(libzippp PRIVATE - ${LIBZIP_LIBRARY} - ${ZLIB_LIBRARY} - ) - -set_target_properties(libzippp PROPERTIES FOLDER "Dependencies/") diff --git a/cmake/minhook.cmake b/cmake/minhook.cmake deleted file mode 100644 index d1da7ca..0000000 --- a/cmake/minhook.cmake +++ /dev/null @@ -1,16 +0,0 @@ -include_guard() -include(FetchContent) - -FetchContent_Declare( - minhook - GIT_REPOSITORY https://github.com/TsudaKageyu/minhook - GIT_TAG master) -FetchContent_GetProperties(minhook) - -if (NOT minhook_POPULATED) - FetchContent_Populate(minhook) -endif() - -add_subdirectory(${minhook_SOURCE_DIR} EXCLUDE_FROM_ALL) - -set_target_properties(minhook PROPERTIES FOLDER "Dependencies/") diff --git a/cmake/msgsl.cmake b/cmake/msgsl.cmake deleted file mode 100644 index 1455239..0000000 --- a/cmake/msgsl.cmake +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required(VERSION 3.14) - -include(FetchContent) - -FetchContent_Declare(GSL - GIT_REPOSITORY "https://github.com/microsoft/GSL" - GIT_TAG "v4.0.0" - GIT_SHALLOW ON -) - -FetchContent_MakeAvailable(GSL) diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake deleted file mode 100644 index 523301e..0000000 --- a/cmake/zlib.cmake +++ /dev/null @@ -1,47 +0,0 @@ -include_guard() -include(FetchContent) - -# Fetch zlib using FetchContent -FetchContent_Declare( - zlib - GIT_REPOSITORY https://github.com/madler/zlib - GIT_TAG v1.3 -) - -FetchContent_GetProperties(zlib) - -if(zlib_POPULATED) - message(STATUS "Skipping zlib download") - return() -endif() - -FetchContent_Populate(zlib) - -if(EXISTS ${CMAKE_INSTALL_PREFIX}/lib/zlibstatic.lib) - message(STATUS "Skipping zlib build") - return() -endif() - -set(OPTIONS - "-A" "Win32" - "-DBUILD_SHARED_LIBS=OFF" - "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" - "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}" -) - -message("Building zlib with OPTIONS:\n${OPTIONS}") - -execute_process( - COMMAND ${CMAKE_COMMAND} ${OPTIONS} . - WORKING_DIRECTORY ${zlib_SOURCE_DIR} -) -execute_process( - COMMAND ${CMAKE_COMMAND} --build . --config Release - WORKING_DIRECTORY ${zlib_SOURCE_DIR} -) -execute_process( - COMMAND ${CMAKE_COMMAND} --install . --config Release - WORKING_DIRECTORY ${zlib_SOURCE_DIR} -) - -message(STATUS "Finished zlib build") diff --git a/vcpkg.json b/vcpkg.json index bacf0fa..732dc60 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,5 +1,8 @@ { "dependencies": [ - "dxsdk-d3dx" + "dxsdk-d3dx", + "libzippp", + "minhook", + "ms-gsl" ] }