Merge pull request #60028 from m-kuhn/cmake_cleanup

Cleanup cmake
qgis · Dec 31, 2024 · 489b8f7 · 489b8f7
2 parents 9d8f23e + 2ea9e79
commit 489b8f7
Show file tree

Hide file tree

Showing 45 changed files with 83 additions and 334 deletions.
diff --git a/.ci/ogc/build.sh b/.ci/ogc/build.sh
@@ -22,7 +22,6 @@ cmake -GNinja \
  -DWITH_3D=OFF \
  -DWITH_STAGED_PLUGINS=OFF \
  -DWITH_GRASS=OFF \
- -DSUPPRESS_QT_WARNINGS=ON \
  -DENABLE_MODELTEST=OFF \
  -DENABLE_PGTEST=OFF \
  -DENABLE_MSSQLTEST=OFF \

diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh
@@ -90,7 +90,6 @@ cmake \
  -DWITH_GRASS7=${WITH_GRASS7} \
  -DWITH_GRASS8=${WITH_GRASS8} \
  -DWITH_GRASS_PLUGIN=${WITH_GRASS8} \
- -DSUPPRESS_QT_WARNINGS=ON \
  -DENABLE_TESTS=ON \
  -DENABLE_MODELTEST=${WITH_QT5} \
  -DENABLE_PGTEST=${WITH_QT5} \

diff --git a/.docker/qgis.dockerfile b/.docker/qgis.dockerfile
@@ -42,7 +42,6 @@ RUN SUCCESS=OK \
   -DBINDINGS_GLOBAL_INSTALL=ON \
   -DWITH_STAGED_PLUGINS=ON \
   -DWITH_GRASS=ON \
-  -DSUPPRESS_QT_WARNINGS=ON \
   -DDISABLE_DEPRECATED=ON \
   -DENABLE_TESTS=OFF \
   -DWITH_QSPATIALITE=ON \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -675,13 +675,6 @@ if(WITH_CORE)
     find_package(Libtasn1 REQUIRED)
   endif()
 
-  if (SUPPRESS_QT_WARNINGS)
-    # Newer versions of UseQt4.cmake include Qt with -isystem automatically
-    # This can be used to force this behavior on older systems
-    # Can be removed as soon as Travis-CI updates from precise
-    include_directories(SYSTEM ${QT_INCLUDE_DIR})
-  endif()
-
   # Disable automatic conversion from QString to ASCII 8-bit strings (char *)
   # (Keeps code compatible with Qt/Mac/64bit)
   add_definitions(-DQT_NO_CAST_TO_ASCII)

diff --git a/python/PyQt6/core/core_auto.sip b/python/PyQt6/core/core_auto.sip
@@ -381,6 +381,8 @@
 %Include auto_generated/gps/qgsgpsinformation.sip
 %Include auto_generated/gps/qgsgpslogger.sip
 %Include auto_generated/gps/qgsnmeaconnection.sip
+%Include auto_generated/gps/qgsqtlocationconnection.sip
+%Include auto_generated/gps/qgsgpsconnectionregistry.sip
 %Include auto_generated/gps/qgssatelliteinformation.sip
 %Include auto_generated/gps/qgsvectorlayergpslogger.sip
 %Include auto_generated/labeling/qgscalloutposition.sip
@@ -805,8 +807,6 @@
 %Include auto_generated/vectortile/qgsvectortileutils.sip
 %Include auto_generated/vectortile/qgsvectortilewriter.sip
 %Include auto_generated/vectortile/qgsvtpktiles.sip
-%Include auto_generated/gps/qgsqtlocationconnection.sip
 %If ( HAVE_WEBENGINE_SIP )
 %Include auto_generated/web/qgswebenginepage.sip
 %End
-%Include auto_generated/gps/qgsgpsconnectionregistry.sip
diff --git a/python/PyQt6/gui/gui_auto.sip b/python/PyQt6/gui/gui_auto.sip
@@ -327,6 +327,7 @@
 %Include auto_generated/editorwidgets/qgsjsoneditwidget.sip
 %End
 %Include auto_generated/editorwidgets/qgsmultiedittoolbutton.sip
+%Include auto_generated/editorwidgets/qgsqmlwidgetwrapper.sip
 %Include auto_generated/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.sip
 %Include auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip
 %Include auto_generated/editorwidgets/qgsrelationreferencewidget.sip
@@ -534,4 +535,3 @@
 %Include auto_generated/tiledscene/qgstiledscenerendererpropertieswidget.sip
 %Include auto_generated/tiledscene/qgstiledscenerendererwidget.sip
 %Include auto_generated/vectortile/qgsvectortilelayerproperties.sip
-%Include auto_generated/editorwidgets/qgsqmlwidgetwrapper.sip
diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -381,6 +381,8 @@
 %Include auto_generated/gps/qgsgpsinformation.sip
 %Include auto_generated/gps/qgsgpslogger.sip
 %Include auto_generated/gps/qgsnmeaconnection.sip
+%Include auto_generated/gps/qgsqtlocationconnection.sip
+%Include auto_generated/gps/qgsgpsconnectionregistry.sip
 %Include auto_generated/gps/qgssatelliteinformation.sip
 %Include auto_generated/gps/qgsvectorlayergpslogger.sip
 %Include auto_generated/labeling/qgscalloutposition.sip
@@ -805,8 +807,6 @@
 %Include auto_generated/vectortile/qgsvectortileutils.sip
 %Include auto_generated/vectortile/qgsvectortilewriter.sip
 %Include auto_generated/vectortile/qgsvtpktiles.sip
-%Include auto_generated/gps/qgsqtlocationconnection.sip
 %If ( HAVE_WEBENGINE_SIP )
 %Include auto_generated/web/qgswebenginepage.sip
 %End
-%Include auto_generated/gps/qgsgpsconnectionregistry.sip
diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip
@@ -327,6 +327,7 @@
 %Include auto_generated/editorwidgets/qgsjsoneditwidget.sip
 %End
 %Include auto_generated/editorwidgets/qgsmultiedittoolbutton.sip
+%Include auto_generated/editorwidgets/qgsqmlwidgetwrapper.sip
 %Include auto_generated/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.sip
 %Include auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip
 %Include auto_generated/editorwidgets/qgsrelationreferencewidget.sip
@@ -534,4 +535,3 @@
 %Include auto_generated/tiledscene/qgstiledscenerendererpropertieswidget.sip
 %Include auto_generated/tiledscene/qgstiledscenerendererwidget.sip
 %Include auto_generated/vectortile/qgsvectortilelayerproperties.sip
-%Include auto_generated/editorwidgets/qgsqmlwidgetwrapper.sip
diff --git a/src/3d/CMakeLists.txt b/src/3d/CMakeLists.txt
@@ -288,11 +288,13 @@ target_include_directories(qgis_3d PUBLIC
   ${CMAKE_SOURCE_DIR}/external/tinygltf
 )
 
-if (BUILD_WITH_QT6)
-  target_link_libraries(qgis_3d Qt6::3DCore Qt6::3DRender Qt6::3DInput Qt6::3DLogic Qt6::3DExtras)
-else()
-  target_link_libraries(qgis_3d Qt5::3DCore Qt5::3DRender Qt5::3DInput Qt5::3DLogic Qt5::3DExtras)
-endif()
+target_link_libraries(qgis_3d
+  ${QT_VERSION_BASE}::3DCore
+  ${QT_VERSION_BASE}::3DRender
+  ${QT_VERSION_BASE}::3DInput
+  ${QT_VERSION_BASE}::3DLogic
+  ${QT_VERSION_BASE}::3DExtras
+)
 
 GENERATE_EXPORT_HEADER(
    qgis_3d

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -435,12 +435,6 @@ else()
   set(QWTPOLAR_INCLUDE_DIR "")
 endif()
 
-if (POSTGRES_FOUND)
-  if(HAVE_PGCONFIG)
-    add_definitions(-DHAVE_PGCONFIG=1)
-  endif()
-endif()
-
 # Test data dir for QgsAppScreenShots
 add_definitions(-DTEST_DATA_DIR="${TEST_DATA_DIR}")
 
@@ -513,10 +507,6 @@ if (APPLE)
   include_directories(${CMAKE_SOURCE_DIR}/src/native/mac)
 endif()
 
-if (POSTGRES_FOUND)
-  include_directories(SYSTEM ${POSTGRES_INCLUDE_DIR})
-endif()
-
 #############
 if (ANDROID)
   add_library(${QGIS_APP_NAME} ${LIBRARY_TYPE} ${QGIS_APPMAIN_SRCS})
@@ -549,6 +539,9 @@ add_library(qgis_app ${LIBRARY_TYPE} ${QGIS_APP_SRCS})
 target_compile_features(qgis_app PRIVATE cxx_std_17)
 
 target_compile_definitions(qgis_app PRIVATE "QT_PLUGINS_DIR=\"${QT_PLUGINS_DIR}\"")
+if (POSTGRES_FOUND)
+  target_compile_definitions(qgis_app PRIVATE -DPOSTGRESQL_VERSION=${PostgreSQL_VERSION_STRING})
+endif()
 
 target_include_directories(qgis_app PUBLIC
   ${CMAKE_SOURCE_DIR}/external/nmea
@@ -586,7 +579,6 @@ if (WITH_3D)
 endif()
 
 target_include_directories(qgis_app SYSTEM PUBLIC
-  ${QT_QTUITOOLS_INCLUDE_DIR}
   ${QWTPOLAR_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/external/qt-unix-signals
 )
@@ -693,10 +685,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
   target_link_libraries(${QGIS_APP_NAME} ${EXECINFO_LIBRARY})
 endif()
 
-if (POSTGRES_FOUND)
-  target_link_libraries (qgis_app ${POSTGRES_LIBRARY})
-endif()
-
 if (WITH_PDAL)
   target_link_libraries(qgis_app ${PDAL_LIBRARIES})
 endif()

diff --git a/src/auth/apiheader/CMakeLists.txt b/src/auth/apiheader/CMakeLists.txt
@@ -16,11 +16,7 @@ if (WITH_GUI)
     gui/qgsauthapiheaderedit.h
   )
   set(AUTH_APIHEADER_UIS gui/qgsauthapiheaderedit.ui)
-  if (BUILD_WITH_QT6)
-    QT6_WRAP_UI(AUTH_APIHEADER_UIS_H ${AUTH_APIHEADER_UIS})
-  else()
-    QT5_WRAP_UI(AUTH_APIHEADER_UIS_H ${AUTH_APIHEADER_UIS})
-  endif()
+  qt_wrap_ui(AUTH_APIHEADER_UIS_H ${AUTH_APIHEADER_UIS})
 endif()
 
 

diff --git a/src/auth/awss3/CMakeLists.txt b/src/auth/awss3/CMakeLists.txt
@@ -16,11 +16,7 @@ if (WITH_GUI)
     gui/qgsauthawss3edit.h
   )
   set(AUTH_AWSS3_UIS gui/qgsauthawss3edit.ui)
-  if (BUILD_WITH_QT6)
-    QT6_WRAP_UI(AUTH_AWSS3_UIS_H ${AUTH_AWSS3_UIS})
-  else()
-    QT5_WRAP_UI(AUTH_AWSS3_UIS_H ${AUTH_AWSS3_UIS})
-  endif()
+  qt_wrap_ui(AUTH_AWSS3_UIS_H ${AUTH_AWSS3_UIS})
 endif()
 
 

diff --git a/src/auth/basic/CMakeLists.txt b/src/auth/basic/CMakeLists.txt
@@ -16,11 +16,7 @@ if (WITH_GUI)
     gui/qgsauthbasicedit.h
   )
   set(AUTH_BASIC_UIS gui/qgsauthbasicedit.ui)
-  if (BUILD_WITH_QT6)
-    QT6_WRAP_UI(AUTH_BASIC_UIS_H ${AUTH_BASIC_UIS})
-  else()
-    QT5_WRAP_UI(AUTH_BASIC_UIS_H ${AUTH_BASIC_UIS})
-  endif()
+  qt_wrap_ui(AUTH_BASIC_UIS_H ${AUTH_BASIC_UIS})
 endif()
 
 

diff --git a/src/auth/esritoken/CMakeLists.txt b/src/auth/esritoken/CMakeLists.txt
@@ -16,11 +16,7 @@ if (WITH_GUI)
     gui/qgsauthesritokenedit.h
   )
   set(AUTH_ESRITOKEN_UIS gui/qgsauthesritokenedit.ui)
-  if (BUILD_WITH_QT6)
-    QT6_WRAP_UI(AUTH_ESRITOKEN_UIS_H ${AUTH_ESRITOKEN_UIS})
-  else()
-    QT5_WRAP_UI(AUTH_ESRITOKEN_UIS_H ${AUTH_ESRITOKEN_UIS})
-  endif()
+  qt_wrap_ui(AUTH_ESRITOKEN_UIS_H ${AUTH_ESRITOKEN_UIS})
 endif()
 
 

diff --git a/src/auth/identcert/CMakeLists.txt b/src/auth/identcert/CMakeLists.txt
@@ -16,11 +16,7 @@ if (WITH_GUI)
     gui/qgsauthidentcertedit.h
   )
   set(AUTH_IDENTCERT_UIS gui/qgsauthidentcertedit.ui)
-  if (BUILD_WITH_QT6)
-    QT6_WRAP_UI(AUTH_IDENTCERT_UIS_H ${AUTH_IDENTCERT_UIS})
-  else()
-    QT5_WRAP_UI(AUTH_IDENTCERT_UIS_H ${AUTH_IDENTCERT_UIS})
-  endif()
+  qt_wrap_ui(AUTH_IDENTCERT_UIS_H ${AUTH_IDENTCERT_UIS})
 endif()
 
 

diff --git a/src/auth/maptiler_hmacsha256/CMakeLists.txt b/src/auth/maptiler_hmacsha256/CMakeLists.txt
@@ -16,11 +16,7 @@ if (WITH_GUI)
     gui/qgsauthmaptilerhmacsha256edit.h
   )
   set(AUTH_MAPTILER_HMACSHA256_UIS gui/qgsauthmaptilerhmacsha256edit.ui)
-  if (BUILD_WITH_QT6)
-    QT6_WRAP_UI(AUTH_MAPTILER_HMACSHA256_UIS_H ${AUTH_MAPTILER_HMACSHA256_UIS})
-  else()
-    QT5_WRAP_UI(AUTH_MAPTILER_HMACSHA256_UIS_H ${AUTH_MAPTILER_HMACSHA256_UIS})
-  endif()
+  qt_wrap_ui(AUTH_MAPTILER_HMACSHA256_UIS_H ${AUTH_MAPTILER_HMACSHA256_UIS})
 endif()
 
 

diff --git a/src/auth/oauth2/CMakeLists.txt b/src/auth/oauth2/CMakeLists.txt
@@ -84,11 +84,7 @@ if (WITH_GUI)
   )
 
   set(AUTH_OAUTH2_UIS gui/qgsauthoauth2edit.ui)
-  if (BUILD_WITH_QT6)
-    QT6_WRAP_UI(AUTH_OAUTH2_UIS_H ${AUTH_OAUTH2_UIS})
-  else()
-    QT5_WRAP_UI(AUTH_OAUTH2_UIS_H ${AUTH_OAUTH2_UIS})
-  endif()
+  qt_wrap_ui(AUTH_OAUTH2_UIS_H ${AUTH_OAUTH2_UIS})
 
 endif()
 

diff --git a/src/auth/pkipaths/CMakeLists.txt b/src/auth/pkipaths/CMakeLists.txt
@@ -16,11 +16,7 @@ if (WITH_GUI)
     gui/qgsauthpkipathsedit.h
   )
   set(AUTH_PKIPATHS_UIS gui/qgsauthpkipathsedit.ui)
-  if (BUILD_WITH_QT6)
-    QT6_WRAP_UI(AUTH_PKIPATHS_UIS_H ${AUTH_PKIPATHS_UIS})
-  else()
-    QT5_WRAP_UI(AUTH_PKIPATHS_UIS_H ${AUTH_PKIPATHS_UIS})
-  endif()
+  qt_wrap_ui(AUTH_PKIPATHS_UIS_H ${AUTH_PKIPATHS_UIS})
 endif()
 
 # static library

diff --git a/src/auth/pkipkcs12/CMakeLists.txt b/src/auth/pkipkcs12/CMakeLists.txt
@@ -16,11 +16,7 @@ if (WITH_GUI)
     gui/qgsauthpkcs12edit.h
   )
   set(AUTH_PKCS12_UIS gui/qgsauthpkcs12edit.ui)
-  if (BUILD_WITH_QT6)
-    QT6_WRAP_UI(AUTH_PKCS12_UIS_H ${AUTH_PKCS12_UIS})
-  else()
-    QT5_WRAP_UI(AUTH_PKCS12_UIS_H ${AUTH_PKCS12_UIS})
-  endif()
+  qt_wrap_ui(AUTH_PKCS12_UIS_H ${AUTH_PKCS12_UIS})
 endif()
 
 # static library