From 63b2caab2f37a7601b26f299df74320794af6fe3 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Sun, 14 Jul 2024 23:08:35 +0200 Subject: [PATCH] install nlohmann/json_fwd.hpp if using WITH_INTERNAL_NLOHMANN_JSON (followup c268fb14035678c1a61e7793afe8aaee159094b5) --- debian/control.in | 2 ++ debian/rules | 1 + src/core/CMakeLists.txt | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/debian/control.in b/debian/control.in index 1e37feceb4e1..37c9ecb5658f 100644 --- 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, @@ -289,6 +290,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 index 71d1645447ec..11f3bd6d05d7 100755 --- 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 index f12cba892e70..eda085e9570c 100644 --- 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