use vcpkg for more packages

gwdevhub · Nov 11, 2024 · 46372df · 46372df
1 parent 046517e
commit 46372df
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 194 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,12 +9,6 @@ if(NOT(CMAKE_SIZEOF_VOID_P EQUAL 4))
     message(FATAL_ERROR "You are configuring a non 32-bit build, this is not supported. Run cmake with `-A Win32`")
 endif()
 
-option(CLEAN "Cleans third party libraries and recompiles them" OFF)
-if(${CLEAN} MATCHES "ON")
-    message("Removing directory: ${PROJECT_SOURCE_DIR}/bin/install")
-    file(REMOVE_RECURSE ${PROJECT_SOURCE_DIR}/bin/install)
-endif()
-
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 7)
 set(VERSION_PATCH 0)
@@ -32,10 +26,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 +50,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
@@ -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
diff --git a/cmake/libzippp.cmake b/cmake/libzippp.cmake
diff --git a/cmake/minhook.cmake b/cmake/minhook.cmake
diff --git a/cmake/msgsl.cmake b/cmake/msgsl.cmake
diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,5 +1,8 @@
 {
   "dependencies": [
-    "dxsdk-d3dx"
+    "dxsdk-d3dx",
+    "libzippp",
+    "minhook",
+    "ms-gsl"
   ]
 }