sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

[cmake] Use PostgreSQL::PostgreSQL target

Browse Source
This commit is contained in:
Matthias Kuhn 2024-12-30 16:23:03 +01:00
parent 7ed4d4cf95
commit d2078b0092
10 changed files with 6 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/CMakeLists.txt
View File

@ -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()

4
src/plugins/grass/CMakeLists.txt
View File

@ -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}})

1
src/providers/mssql/CMakeLists.txt
View File

@ -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}

25
src/providers/postgres/CMakeLists.txt
View File

@ -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)

1
src/server/CMakeLists.txt
View File

@ -120,7 +120,6 @@ endif()
target_link_libraries(qgis_server
qgis_core
${FCGI_LIBRARY}
${POSTGRES_LIBRARY}
${QCA_LIBRARY}
)

4
src/server/services/wcs/CMakeLists.txt
View File

@ -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

4
src/server/services/wfs/CMakeLists.txt
View File

@ -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

4
src/server/services/wfs3/CMakeLists.txt
View File

@ -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

4
src/server/services/wms/CMakeLists.txt
View File

@ -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

4
src/server/services/wmts/CMakeLists.txt
View File

@ -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/