From d2078b0092bef0b1895a6223dc428f8a01d7d7fb Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 30 Dec 2024 16:23:03 +0100 Subject: [PATCH] [cmake] Use PostgreSQL::PostgreSQL target --- src/app/CMakeLists.txt | 17 +++-------------- src/plugins/grass/CMakeLists.txt | 4 ---- src/providers/mssql/CMakeLists.txt | 1 - src/providers/postgres/CMakeLists.txt | 25 +++---------------------- src/server/CMakeLists.txt | 1 - src/server/services/wcs/CMakeLists.txt | 4 ---- src/server/services/wfs/CMakeLists.txt | 4 ---- src/server/services/wfs3/CMakeLists.txt | 4 ---- src/server/services/wms/CMakeLists.txt | 4 ---- src/server/services/wmts/CMakeLists.txt | 4 ---- 10 files changed, 6 insertions(+), 62 deletions(-) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index fa5b9892cd5..7d9c02299d8 100644 --- 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 @@ -693,10 +686,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/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt index 21ef3d47c86..cf928078f13 100644 --- a/src/plugins/grass/CMakeLists.txt +++ b/src/plugins/grass/CMakeLists.txt @@ -80,10 +80,6 @@ include_directories( ${CMAKE_BINARY_DIR}/src/app ${CMAKE_CURRENT_BINARY_DIR} ) -include_directories(SYSTEM - ${POSTGRES_INCLUDE_DIR} -) - macro(ADD_GRASSPLUGIN GRASS_BUILD_VERSION) set(GRASS_PREFIX ${GRASS_PREFIX${GRASS_BUILD_VERSION}}) diff --git a/src/providers/mssql/CMakeLists.txt b/src/providers/mssql/CMakeLists.txt index 995e28e4198..6bac286e9e8 100644 --- a/src/providers/mssql/CMakeLists.txt +++ b/src/providers/mssql/CMakeLists.txt @@ -68,7 +68,6 @@ target_compile_definitions(provider_mssql_a PRIVATE "CMAKE_SOURCE_DIR=\"${CMAKE_ target_link_libraries (provider_mssql_a qgis_core - ${POSTGRES_LIBRARY} ${Qt5Xml_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Svg_LIBRARIES} diff --git a/src/providers/postgres/CMakeLists.txt b/src/providers/postgres/CMakeLists.txt index 42e82b190b2..a61fb7c2dd6 100644 --- a/src/providers/postgres/CMakeLists.txt +++ b/src/providers/postgres/CMakeLists.txt @@ -44,10 +44,6 @@ add_library (provider_postgres_a STATIC ${PG_SRCS} ${PG_HDRS}) set_target_properties(provider_postgres_a PROPERTIES UNITY_BUILD ${ENABLE_UNITY_BUILDS}) -target_include_directories(provider_postgres_a SYSTEM PUBLIC - ${POSTGRES_INCLUDE_DIR} -) - target_include_directories(provider_postgres_a PUBLIC ${CMAKE_SOURCE_DIR}/src/providers/postgres ) @@ -58,7 +54,7 @@ target_compile_definitions(provider_postgres_a PRIVATE "CMAKE_SOURCE_DIR=\"${CMA target_link_libraries (provider_postgres_a qgis_core - ${POSTGRES_LIBRARY} + PostgreSQL::PostgreSQL ) if (WITH_GUI) @@ -68,10 +64,6 @@ if (WITH_GUI) set_target_properties(provider_postgres_gui_a PROPERTIES UNITY_BUILD ${ENABLE_UNITY_BUILDS}) - target_include_directories(provider_postgres_gui_a SYSTEM PRIVATE - ${POSTGRES_INCLUDE_DIR} - ) - target_include_directories(provider_postgres_gui_a PUBLIC ${CMAKE_BINARY_DIR}/src/providers/postgres ) @@ -83,7 +75,6 @@ if (WITH_GUI) target_link_libraries(provider_postgres_gui_a qgis_gui provider_postgres_a - ${POSTGRES_LIBRARY} ) add_dependencies(provider_postgres_gui_a ui) endif() @@ -103,9 +94,6 @@ set(PGRASTER_SRCS # static library add_library (provider_postgresraster_a STATIC ${PGRASTER_SRCS} ${PG_HDRS}) -target_include_directories(provider_postgresraster_a SYSTEM PRIVATE - ${POSTGRES_INCLUDE_DIR} -) target_include_directories(provider_postgresraster_a PUBLIC ${CMAKE_SOURCE_DIR}/src/providers/postgres/raster ) @@ -117,7 +105,6 @@ target_compile_definitions(provider_postgresraster_a PRIVATE "CMAKE_SOURCE_DIR=\ target_link_libraries (provider_postgresraster_a qgis_core provider_postgres_a - ${POSTGRES_LIBRARY} ) if (WITH_GUI) @@ -144,12 +131,6 @@ else() set_target_properties(provider_postgres PROPERTIES UNITY_BUILD ${ENABLE_UNITY_BUILDS}) set_target_properties(provider_postgresraster PROPERTIES UNITY_BUILD ${ENABLE_UNITY_BUILDS}) - target_include_directories(provider_postgres SYSTEM PRIVATE - ${POSTGRES_INCLUDE_DIR} - ) - target_include_directories(provider_postgresraster SYSTEM PRIVATE - ${POSTGRES_INCLUDE_DIR} - ) target_include_directories(provider_postgresraster PRIVATE ${CMAKE_SOURCE_DIR}/src/providers/postgres ) @@ -162,12 +143,12 @@ else() target_link_libraries(provider_postgres qgis_core - ${POSTGRES_LIBRARY} + PostgreSQL::PostgreSQL ) target_link_libraries(provider_postgresraster qgis_core - ${POSTGRES_LIBRARY} + PostgreSQL::PostgreSQL ) if (WITH_GUI) diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index de9ecf8fde6..f1c1fb6368e 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -120,7 +120,6 @@ endif() target_link_libraries(qgis_server qgis_core ${FCGI_LIBRARY} - ${POSTGRES_LIBRARY} ${QCA_LIBRARY} ) diff --git a/src/server/services/wcs/CMakeLists.txt b/src/server/services/wcs/CMakeLists.txt index e728e6fc11a..04cd461997b 100644 --- a/src/server/services/wcs/CMakeLists.txt +++ b/src/server/services/wcs/CMakeLists.txt @@ -18,10 +18,6 @@ add_library (wcs MODULE ${wcs_SRCS}) # require c++17 target_compile_features(wcs PRIVATE cxx_std_17) -include_directories(SYSTEM - ${POSTGRES_INCLUDE_DIR} -) - include_directories( ${CMAKE_SOURCE_DIR}/src/server ${CMAKE_SOURCE_DIR}/src/server/services diff --git a/src/server/services/wfs/CMakeLists.txt b/src/server/services/wfs/CMakeLists.txt index 8a3cb241713..dc080b5e6ba 100644 --- a/src/server/services/wfs/CMakeLists.txt +++ b/src/server/services/wfs/CMakeLists.txt @@ -34,10 +34,6 @@ foreach(_library_type MODULE STATIC) # require c++17 target_compile_features(${_library_name} PRIVATE cxx_std_17) - include_directories(${_library_name} SYSTEM PUBLIC - ${POSTGRES_INCLUDE_DIR} - ) - target_include_directories(${_library_name} PUBLIC ${CMAKE_SOURCE_DIR}/src/server ${CMAKE_SOURCE_DIR}/src/server/services diff --git a/src/server/services/wfs3/CMakeLists.txt b/src/server/services/wfs3/CMakeLists.txt index b0b8a244098..789d9e8724b 100644 --- a/src/server/services/wfs3/CMakeLists.txt +++ b/src/server/services/wfs3/CMakeLists.txt @@ -15,10 +15,6 @@ add_library (wfs3 MODULE ${WFS3_SRCS}) # require c++17 target_compile_features(wfs3 PRIVATE cxx_std_17) -include_directories(SYSTEM - ${POSTGRES_INCLUDE_DIR} -) - include_directories( ${CMAKE_SOURCE_DIR}/src/server diff --git a/src/server/services/wms/CMakeLists.txt b/src/server/services/wms/CMakeLists.txt index 651e44162bd..63a7ff7b47d 100644 --- a/src/server/services/wms/CMakeLists.txt +++ b/src/server/services/wms/CMakeLists.txt @@ -45,10 +45,6 @@ foreach(_library_type MODULE STATIC) # require c++17 target_compile_features(${_library_name} PRIVATE cxx_std_17) - include_directories(${_library_name} SYSTEM PUBLIC - ${POSTGRES_INCLUDE_DIR} - ) - target_include_directories(${_library_name} PUBLIC ${CMAKE_SOURCE_DIR}/src/server ${CMAKE_SOURCE_DIR}/src/server/services diff --git a/src/server/services/wmts/CMakeLists.txt b/src/server/services/wmts/CMakeLists.txt index 23b7fb8b86b..9f90ced2904 100644 --- a/src/server/services/wmts/CMakeLists.txt +++ b/src/server/services/wmts/CMakeLists.txt @@ -23,10 +23,6 @@ add_library (wmts MODULE ${WMTS_SRCS} ${WMTS_HDRS}) # require c++17 target_compile_features(wmts PRIVATE cxx_std_17) -include_directories(SYSTEM - ${POSTGRES_INCLUDE_DIR} -) - include_directories( ${CMAKE_SOURCE_DIR}/src/server/