make sure headers from external/ are only used when enabled (to allow

use of more up to date system nlohmann headers and not to use the
external meshoptimizer headers although the system's library ought to be
used)

CMakeLists.txt

@@ -1170,6 +1170,12 @@ endif()
 configure_file(${CMAKE_SOURCE_DIR}/cmake_templates/qgsconfig.h.in ${CMAKE_BINARY_DIR}/qgsconfig.h)
 include_directories(${CMAKE_BINARY_DIR})
 
+if(WITH_INTERNAL_NLOHMANN_JSON)
+  include_directories(SYSTEM
+    ${CMAKE_SOURCE_DIR}/external/nlohmann
+  )
+endif()
+
 #############################################################
 # create qgsversion.h
 include(CreateQgsVersion)

python/CMakeLists.txt

@@ -253,7 +253,7 @@ endif()
 
 # additional analysis includes
 if(WITH_ANALYSIS)
-  set(ANALYSIS_INCLUDE_DIRECTORIES_BEFORE
+  include_directories(BEFORE
     ${CMAKE_BINARY_DIR}/src/analysis/processing
     ${CMAKE_BINARY_DIR}/src/analysis/georeferencing
     ${CMAKE_BINARY_DIR}/src/analysis/vector
@@ -262,13 +262,12 @@ if(WITH_ANALYSIS)
     ${CMAKE_BINARY_DIR}/src/analysis/network
     ${CMAKE_BINARY_DIR}/src/analysis/interpolation
   )
-  if (WITH_PDAL AND NOT PDAL_2_5_OR_HIGHER)
-     list(APPEND ANALYSIS_INCLUDE_DIRECTORIES_BEFORE
-       ${CMAKE_SOURCE_DIR}/src/analysis/processing/pdal
-     )
-  endif()
 
-  include_directories(BEFORE ${ANALYSIS_INCLUDE_DIRECTORIES_BEFORE})
+  if (WITH_PDAL AND PDAL_2_5_OR_HIGHER)
+    include_directories(BEFORE
+      ${CMAKE_SOURCE_DIR}/src/analysis/processing/pdal
+    )
+  endif()
 
   # analysis module
   file(GLOB_RECURSE sip_files_analysis ${BINDING_FILES_ROOT_DIR}/analysis/*.sip ${BINDING_FILES_ROOT_DIR}/analysis/*.sip.in)

python/PyQt6/server/auto_generated/qgsserverquerystringparameter.sip.in

@@ -11,8 +11,6 @@
 
 
 
-
-
 class QgsServerQueryStringParameter
 {
 %Docstring(signature="appended")

python/server/auto_generated/qgsserverquerystringparameter.sip.in

@@ -11,8 +11,6 @@
 
 
 
-
-
 class QgsServerQueryStringParameter
 {
 %Docstring(signature="appended")

src/analysis/CMakeLists.txt

@@ -586,9 +586,13 @@ target_include_directories(qgis_analysis PUBLIC
   ${CMAKE_SOURCE_DIR}/src/analysis/vector/geometry_checker
   ${CMAKE_SOURCE_DIR}/external/tinygltf
   ${CMAKE_BINARY_DIR}/src/analysis
-  ${CMAKE_SOURCE_DIR}/src/analysis/processing/pdal
 )
 
+if (WITH_PDAL AND PDAL_2_5_OR_HIGHER)
+  target_include_directories(qgis_analysis PUBLIC
+    ${CMAKE_SOURCE_DIR}/src/analysis/processing/pdal
+  )
+endif()
 
 GENERATE_EXPORT_HEADER(
    qgis_analysis