[morphologica] add fix_nlohmann_include.patch

microsoft · Feb 11, 2025 · 4a44760 · 4a44760
1 parent 6af8d81
commit 4a44760
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/ports/morphologica/fix_nlohmann_include.patch b/ports/morphologica/fix_nlohmann_include.patch
@@ -0,0 +1,13 @@
+diff --git a/morph/CMakeLists.txt b/morph/CMakeLists.txt
+index 78b3d43..a86b184 100644
+--- a/morph/CMakeLists.txt
++++ b/morph/CMakeLists.txt
+@@ -15,7 +15,7 @@ add_subdirectory(linuxos) # One Linux-specific file
+ add_subdirectory(healpix) # Public, but slightly modified HEALPix headers
+
+ # And the nlohmann/json.hpp header
+-add_subdirectory(nlohmann)
++find_package(nlohmann_json REQUIRED)
+
+ # Graphics headers
+ install(
diff --git a/ports/morphologica/portfile.cmake b/ports/morphologica/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     PATCHES
         remove_number_type.patch
         egl_fix.patch
+	fix_nlohmann_include.patch
 )
 
 vcpkg_cmake_configure(

diff --git a/ports/morphologica/vcpkg.json b/ports/morphologica/vcpkg.json
@@ -10,6 +10,7 @@
     "glfw3",
     "hdf5",
     "opengl",
+    "nlohmann-json",
     {
       "name": "vcpkg-cmake",
       "host": true