install nlohmann/json_fwd.hpp if using WITH_INTERNAL_NLOHMANN_JSON (f…

…ollowup c268fb1)
nyalldawson · Jul 15, 2024 · ba2ff0c · ba2ff0c
1 parent a56f708
commit ba2ff0c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/debian/control.in b/debian/control.in
@@ -37,6 +37,7 @@ Build-Depends:
  libsqlite3-dev,
  libsqlite3-mod-spatialite,
  libzip-dev,
+ nlohmann-json3-dev,
  ninja-build,
  ocl-icd-opencl-dev,
  opencl-headers,
@@ -287,6 +288,7 @@ Depends:
  libqt5webkit5-dev,
  libqwt-qt5-dev,
  libsqlite3-dev,
+ nlohmann-json3-dev,
  pyqt5-dev-tools,
  pyqt5.qsci-dev,
  python3-dev,

diff --git a/debian/rules b/debian/rules
@@ -81,6 +81,7 @@ PYTHON_LIBRARY=$(shell python3-config --ldflags --embed | sed -e 's,-L\(.*\) -L[
 CMAKE_OPTS := \
 	-G Ninja \
 	-DBUILDNAME=$(DEB_BUILD_NAME) \
+	-DWITH_INTERNAL_NLOHMANN_JSON=OFF \
 	-DCMAKE_VERBOSE_MAKEFILE=1 \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DBINDINGS_GLOBAL_INSTALL=TRUE \

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -2420,6 +2420,10 @@ endif()
 
 if(NOT APPLE OR NOT QGIS_MACAPP_FRAMEWORK)
   install(FILES ${QGIS_CORE_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
+
+  if(WITH_INTERNAL_NLOHMANN_JSON)
+    install(FILES ${CMAKE_SOURCE_DIR}/external/nlohmann/json_fwd.hpp DESTINATION ${QGIS_INCLUDE_DIR}/nlohmann)
+  endif()
 else()
 
   set_target_properties(qgis_core PROPERTIES