add qt6 support to debian packaging

.gitignore

@@ -41,8 +41,6 @@ Testing/*
 Thumb.db
 api_doc
 compile_commands.json
-debian/*.debhelper
-debian/*.substvars
 debian/qgis.sh
 desktop.ini
 doc/INSTALL.tex

CMakeLists.txt

@@ -18,15 +18,16 @@ endif()
 set(CMAKE_LINK_DEPENDS_NO_SHARED ON)
 
 option (WITH_PYTHON "Determines whether Python support should be built (disabling it will in particular disable processing)" ON)
-set(WITH_BINDINGS ${WITH_PYTHON} CACHE BOOL "Determines whether Python bindings should be built")
+set (WITH_BINDINGS ${WITH_PYTHON} CACHE BOOL "Determines whether Python bindings should be built")
 
 set (WITH_3D TRUE CACHE BOOL "Determines whether QGIS 3D library should be built")
 set (WITH_QGIS_PROCESS TRUE CACHE BOOL "Determines whether the standalone \"qgis_process\" tool should be built")
 set (WITH_DESKTOP TRUE CACHE BOOL "Determines whether QGIS desktop should be built")
 set (WITH_GUI TRUE CACHE BOOL "Determines whether QGIS GUI library should be built")
-set(WITH_VCPKG FALSE CACHE BOOL "Use the vcpkg submodule for dependency management.")
+set (WITH_VCPKG FALSE CACHE BOOL "Use the vcpkg submodule for dependency management.")
 
-set(SDK_PATH "" CACHE STRING "Build with VCPKG SDK")
+set (SDK_PATH "" CACHE STRING "Build with VCPKG SDK")
+set (QGISPOSTFIX "" CACHE STRING "Optional postfix to apply to public shared objects and executables")
 
 if(NOT SDK_PATH STREQUAL "")
   message(STATUS "Building with SDK -- ${SDK_PATH}")
@@ -656,7 +657,15 @@ if(WITH_CORE)
   # search for QScintilla2 (C++ lib)
   if (WITH_GUI)
     find_package(QScintilla REQUIRED)
-    find_package(Qwt REQUIRED)
+
+    set (WITH_INTERNAL_QWT FALSE CACHE BOOL "Determines if the internal copy of qwt should be used.")
+    if(NOT WITH_INTERNAL_QWT)
+      find_package(Qwt REQUIRED)
+    else()
+      set(QWT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/qwt-6.2)
+      set(QWT_LIBRARY "")
+      set(QWT_VERSION_STR 6.2.0)
+    endif()
   endif()
 
   # Password helper
@@ -1192,6 +1201,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)

cmake/CreateQgsVersion.cmake

@@ -21,7 +21,7 @@ MACRO(CREATE_QGSVERSION)
             OUTPUT ${CMAKE_BINARY_DIR}/qgsversion.h ${CMAKE_BINARY_DIR}/qgsversion.inc
             COMMAND for /f \"usebackq tokens=1\" ${ARG} in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo \#define QGSVERSION \"${ARG}\" >${CMAKE_BINARY_DIR}/qgsversion.h.temp
             COMMAND for /f \"usebackq tokens=1\" ${ARG} in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} \(${ARG}\)\" >${CMAKE_BINARY_DIR}/qgsversion.inc
-            COMMAND ${CMAKE_COMMAND} -DSRC=${CMAKE_BINARY_DIR}/qgsversion.h.temp -DDST=${CMAKE_BINARY_DIR}/qgsversion.h -P ${CMAKE_SOURCE_DIR}/cmake/CopyIfChanged.cmake
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/qgsversion.h.temp ${CMAKE_BINARY_DIR}/qgsversion.h
             MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/.git/index
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
           )
@@ -32,7 +32,7 @@ MACRO(CREATE_QGSVERSION)
             COMMAND ${GITCOMMAND} log -n1 --pretty=\#define\\ QGSVERSION\\ \\"%h\\" >${CMAKE_BINARY_DIR}/qgsversion.h.temp
             COMMAND ${GITCOMMAND} log -n1 --pretty='PROJECT_NUMBER = \"${COMPLETE_VERSION}-${_rn} \(%h\)\"' >${CMAKE_BINARY_DIR}/qgsversion.inc
             COMMAND ${GITCOMMAND} config remote.$$\(${GITCOMMAND} config branch.$$\(${GITCOMMAND} name-rev --name-only HEAD\).remote\).url | sed -e 's/^/\#define QGS_GIT_REMOTE_URL \"/' -e 's/$$/\"/' >>${CMAKE_BINARY_DIR}/qgsversion.h.temp
-            COMMAND ${CMAKE_COMMAND} -DSRC=${CMAKE_BINARY_DIR}/qgsversion.h.temp -DDST=${CMAKE_BINARY_DIR}/qgsversion.h -P ${CMAKE_SOURCE_DIR}/cmake/CopyIfChanged.cmake
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/qgsversion.h.temp ${CMAKE_BINARY_DIR}/qgsversion.h
             MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/.git/index
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
           )

cmake/FindPostgres.cmake

@@ -119,7 +119,6 @@ ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
 
 
 IF (POSTGRES_FOUND)
-
    IF (NOT POSTGRES_FIND_QUIETLY)
       MESSAGE(STATUS "Found PostgreSQL: ${POSTGRES_LIBRARY}")
    ENDIF (NOT POSTGRES_FIND_QUIETLY)

cmake/FindSpatiaLite.cmake

@@ -17,16 +17,7 @@ if(PkgConfig_FOUND)
 endif()
 
 if(PC_SPATIALITE_FOUND)
-  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
-    add_library(spatialite::spatialite ALIAS PkgConfig::PC_SPATIALITE)
-  else()
-    set(SPATIALITE_INCLUDE_DIR "${PC_SPATIALITE_INCLUDE_DIRS}" CACHE STRING "")
-    set(SPATIALITE_LIBRARY "${PC_SPATIALITE_LIBRARIES}" CACHE STRING "")
-    if(NOT TARGET spatialite::spatialite)
-      add_library(spatialite::spatialite INTERFACE IMPORTED)
-      set_target_properties(spatialite::spatialite PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_SPATIALITE)
-    endif()
-  endif()
+  add_library(spatialite::spatialite ALIAS PkgConfig::PC_SPATIALITE)
   set(SPATIALITE_FOUND TRUE)
 else()
   # Fallback for systems without PkgConfig, e.g. OSGeo4W