Merge pull request #52 from PartStackerCommunity/vcpkg

k3DW · web-flow · commit 9f89618cfdea · 2025-05-19T18:23:33.000-05:00
Use vcpkg for thirdparty dependencies
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,3 @@
-[submodule "external/wxWidgets"]
-	path = external/wxWidgets
-	url = https://github.com/wxWidgets/wxWidgets.git
-[submodule "external/mdspan"]
-	path = external/mdspan
-	url = https://github.com/kokkos/mdspan.git
-[submodule "external/glew"]
-	path = external/glew
-	url = https://github.com/PartStackerCommunity/glew.git
-[submodule "external/Catch2"]
-	path = external/Catch2
-	url = https://github.com/catchorg/Catch2.git
+[submodule "external/vcpkg"]
+	path = external/vcpkg
+	url = https://github.com/microsoft/vcpkg.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,12 @@
-cmake_minimum_required(VERSION 3.23)
+cmake_minimum_required(VERSION 3.30)
+
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+    set(VCPKG_TARGET_TRIPLET "x64-windows-static-md" CACHE STRING "" FORCE)
+elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+    set(VCPKG_TARGET_TRIPLET "x64-osx" CACHE STRING "" FORCE)
+else()
+    message(FATAL_ERROR "Unsupported platform: ${CMAKE_HOST_SYSTEM_NAME}")
+endif()
 
 project(PartStacker LANGUAGES CXX)
 
@@ -8,5 +16,9 @@ endif()
 
 enable_testing()
 
-add_subdirectory(external)
+find_package(Catch2 CONFIG REQUIRED)
+find_package(GLEW REQUIRED)
+find_package(mdspan CONFIG REQUIRED)
+find_package(wxWidgets CONFIG REQUIRED COMPONENTS core base net gl)
+
 add_subdirectory(src)
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -2,7 +2,7 @@
     "version": 3,
     "cmakeMinimumRequired": {
         "major": 3,
-        "minor": 23,
+        "minor": 30,
         "patch": 0
     },
     "configurePresets": [
@@ -13,7 +13,8 @@
             "cacheVariables": {
                 "CMAKE_CXX_STANDARD": "23",
                 "CMAKE_CXX_STANDARD_REQUIRED": "ON",
-                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+                "CMAKE_TOOLCHAIN_FILE": "external/vcpkg/scripts/buildsystems/vcpkg.cmake"
             }
         },
         {
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
diff --git a/external/Catch2 b/external/Catch2
diff --git a/external/glew b/external/glew
diff --git a/external/mdspan b/external/mdspan
diff --git a/external/vcpkg b/external/vcpkg
@@ -0,0 +1 @@
+Subproject commit f26ec398c25c4980f33a50391f00a75f7ad62ef7
diff --git a/external/wxWidgets b/external/wxWidgets
diff --git a/src/pstack/CMakeLists.txt b/src/pstack/CMakeLists.txt
@@ -6,10 +6,13 @@ macro(pstack_add_test_executable target)
         "${target}"
         Catch2::Catch2WithMain
     )
+    get_target_property(component_name "${target}" PROJECT_LABEL)
     set_target_properties("${target}_test" PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin/test"
+        FOLDER "test"
+        PROJECT_LABEL "${component_name}"
     )
-    include("${PROJECT_SOURCE_DIR}/external/Catch2/extras/Catch.cmake")
+    include("${Catch2_DIR}/Catch.cmake")
     catch_discover_tests("${target}_test")
 endmacro()
 
diff --git a/src/pstack/graphics/CMakeLists.txt b/src/pstack/graphics/CMakeLists.txt
@@ -8,16 +8,12 @@ target_sources(pstack_graphics PUBLIC FILE_SET headers TYPE HEADERS FILES
     global.hpp
     shader.hpp
 )
-target_compile_definitions(pstack_graphics PRIVATE
-    GLEW_NO_GLU
-)
 
 set_target_properties(pstack_graphics PROPERTIES
     PROJECT_LABEL "graphics"
 )
 target_link_libraries(pstack_graphics
     PUBLIC pstack_geo
-    PRIVATE glew_s
+    PRIVATE GLEW::GLEW
 )
 target_include_directories(pstack_graphics PUBLIC "${PROJECT_SOURCE_DIR}/src")
-target_include_directories(pstack_graphics PRIVATE "${PROJECT_SOURCE_DIR}/external/glew/include")
diff --git a/src/pstack/gui/CMakeLists.txt b/src/pstack/gui/CMakeLists.txt
@@ -34,10 +34,6 @@ target_link_libraries(pstack_gui PRIVATE
 )
 target_include_directories(pstack_gui PRIVATE "${PROJECT_SOURCE_DIR}/src")
 
-if(WIN32)
-    add_dependencies(pstack_gui pstack_gui_copy_wx_headers)
-endif()
-
 set(PSTACK_OUTPUT_TYPE "GUI")
 set(PSTACK_OUTPUT_FILE_NAME "PartStackerGUI")
 pstack_configure_target_info(pstack_gui)
diff --git a/src/pstack/util/CMakeLists.txt b/src/pstack/util/CMakeLists.txt
@@ -6,7 +6,4 @@ target_sources(pstack_util PUBLIC FILE_SET headers TYPE HEADERS FILES
 set_target_properties(pstack_util PROPERTIES
     PROJECT_LABEL "util"
 )
-target_include_directories(pstack_util INTERFACE
-    "${PROJECT_SOURCE_DIR}/src"
-    "${PROJECT_SOURCE_DIR}/external/mdspan/include"
-)
+target_link_libraries(pstack_util INTERFACE std::mdspan)
diff --git a/src/pstack/util/mdarray.hpp b/src/pstack/util/mdarray.hpp
@@ -7,7 +7,7 @@
 #if defined(__cpp_lib_mdspan) and __cpp_lib_mdspan >= 202207L
 #include <mdspan>
 #else
-#include "mdspan/mdspan.hpp"
+#include <experimental/mdspan>
 #endif
 
 namespace pstack::util {
@@ -18,8 +18,8 @@ using mdspan = std::mdspan<T, std::dextents<std::size_t, Rank>>;
 using std::extents;
 #else
 template <class T, std::size_t Rank>
-using mdspan = MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<T, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, Rank>>;
-using MDSPAN_IMPL_STANDARD_NAMESPACE::extents;
+using mdspan = std::experimental::mdspan<T, std::experimental::dextents<std::size_t, Rank>>;
+using std::experimental::extents;
 #endif
 
 template <class T, std::size_t Rank>
diff --git a/vcpkg.json b/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "partstacker",
+  "version-string": "0.3.0",
+  "dependencies": [
+    "catch2",
+    "glew",
+    "mdspan",
+    "wxwidgets"
+  ]
+}

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,13 @@ macro(pstack_add_test_executable target)`
`6`	`6`	`"${target}"`
`7`	`7`	`Catch2::Catch2WithMain`
`8`	`8`	`)`
	`9`	`+ get_target_property(component_name "${target}" PROJECT_LABEL)`
`9`	`10`	`set_target_properties("${target}_test" PROPERTIES`
`10`	`11`	`RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin/test"`
	`12`	`+ FOLDER "test"`
	`13`	`+ PROJECT_LABEL "${component_name}"`
`11`	`14`	`)`
`12`		`- include("${PROJECT_SOURCE_DIR}/external/Catch2/extras/Catch.cmake")`
	`15`	`+ include("${Catch2_DIR}/Catch.cmake")`
`13`	`16`	`catch_discover_tests("${target}_test")`
`14`	`17`	`endmacro()`
`15`	`18`