From 69530a56a619353e84619705b056397fd95d8cef Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Mon, 21 Jun 2021 21:39:12 +0200 Subject: [PATCH] followup ad618e77182 --- debian/qgis-provider-grass.install | 4 ++-- debian/qgis-providers.install | 20 ++++++++++---------- src/providers/virtual/CMakeLists.txt | 15 ++++++--------- tests/src/quickgui/app/CMakeLists.txt | 2 +- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/debian/qgis-provider-grass.install b/debian/qgis-provider-grass.install index f0f15a38887..f3ec26073ef 100644 --- a/debian/qgis-provider-grass.install +++ b/debian/qgis-provider-grass.install @@ -2,5 +2,5 @@ usr/lib/qgis/grass/modules/qgis.d.rast? usr/lib/qgis/grass/modules/qgis.g.info? usr/lib/qgis/grass/modules/qgis.r.in? usr/lib/qgis/grass/modules/qgis.v.in? -usr/lib/qgis/plugins/libgrassprovider?.so -usr/lib/qgis/plugins/libgrassrasterprovider?.so +usr/lib/qgis/plugins/libprovider_grass?.so +usr/lib/qgis/plugins/libprovider_grassraster?.so diff --git a/debian/qgis-providers.install b/debian/qgis-providers.install index 327382b1d3d..9d6783d975a 100644 --- a/debian/qgis-providers.install +++ b/debian/qgis-providers.install @@ -1,18 +1,20 @@ usr/lib/qgis/crssync usr/lib/qgis/untwine -usr/lib/qgis/plugins/libprovider_arcgisfeatureserver.so -usr/lib/qgis/plugins/libprovider_arcgismapserver.so usr/lib/qgis/plugins/libauthmethod_basic.so -usr/lib/qgis/plugins/libprovider_db2.so -usr/lib/qgis/plugins/libprovider_delimitedtext.so usr/lib/qgis/plugins/libauthmethod_esritoken.so -usr/lib/qgis/plugins/libprovider_geonode.so -usr/lib/qgis/plugins/libprovider_gpx.so usr/lib/qgis/plugins/libauthmethod_identcert.so -usr/lib/qgis/plugins/libprovider_mdal.so -usr/lib/qgis/plugins/libprovider_mssql.so usr/lib/qgis/plugins/libauthmethod_pkcs12.so usr/lib/qgis/plugins/libauthmethod_pkipaths.so +usr/lib/qgis/plugins/libprovider_arcgisfeatureserver.so +usr/lib/qgis/plugins/libprovider_arcgismapserver.so +usr/lib/qgis/plugins/libprovider_db2.so +usr/lib/qgis/plugins/libprovider_delimitedtext.so +usr/lib/qgis/plugins/libprovider_geonode.so +usr/lib/qgis/plugins/libprovider_gpx.so +usr/lib/qgis/plugins/libprovider_hana.so +usr/lib/qgis/plugins/libprovider_mdal.so +usr/lib/qgis/plugins/libprovider_mssql.so +usr/lib/qgis/plugins/libprovider_pdal.so usr/lib/qgis/plugins/libprovider_postgres.so usr/lib/qgis/plugins/libprovider_postgresraster.so usr/lib/qgis/plugins/libprovider_spatialite.so @@ -20,6 +22,4 @@ usr/lib/qgis/plugins/libprovider_virtuallayer.so usr/lib/qgis/plugins/libprovider_wcs.so usr/lib/qgis/plugins/libprovider_wfs.so usr/lib/qgis/plugins/libprovider_wms.so -usr/lib/qgis/plugins/libprovider_pdal.so -usr/lib/qgis/plugins/libprovider_hana.so usr/lib/*/qt?/plugins/sqldrivers/libqsqlspatialite.so diff --git a/src/providers/virtual/CMakeLists.txt b/src/providers/virtual/CMakeLists.txt index dac0e5616ab..b018bc6b09b 100644 --- a/src/providers/virtual/CMakeLists.txt +++ b/src/providers/virtual/CMakeLists.txt @@ -40,14 +40,11 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} # ui_xxx_dlg.h ) - include_directories(SYSTEM ${POSTGRES_INCLUDE_DIR} ) - - -add_library(virtuallayerprovider MODULE +add_library(provider_virtuallayer MODULE ${QGIS_VLAYER_PROVIDER_SRCS} ${QGIS_VLAYER_PROVIDER_HDRS} ${vlayer_provider_UI_H} @@ -55,9 +52,9 @@ add_library(virtuallayerprovider MODULE ) # require c++17 -target_compile_features(virtuallayerprovider PRIVATE cxx_std_17) +target_compile_features(provider_virtuallayer PRIVATE cxx_std_17) -target_link_libraries( virtuallayerprovider +target_link_libraries(provider_virtuallayer qgis_core ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} @@ -67,13 +64,13 @@ target_link_libraries( virtuallayerprovider ) if (WITH_GUI) - target_link_libraries (virtuallayerprovider + target_link_libraries (provider_virtuallayer qgis_gui ) - add_dependencies(virtuallayerprovider ui) + add_dependencies(provider_virtuallayer ui) endif() -install(TARGETS virtuallayerprovider +install(TARGETS provider_virtuallayer RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} LIBRARY DESTINATION ${QGIS_PLUGIN_DIR} ) diff --git a/tests/src/quickgui/app/CMakeLists.txt b/tests/src/quickgui/app/CMakeLists.txt index 165364b317d..e506bfa2489 100644 --- a/tests/src/quickgui/app/CMakeLists.txt +++ b/tests/src/quickgui/app/CMakeLists.txt @@ -51,7 +51,7 @@ target_compile_definitions(${QGIS_QUICK_APP_NAME} PRIVATE "-DQT_NO_FOREACH") add_dependencies(${QGIS_QUICK_APP_NAME} qgis_quick_plugin provider_spatialite - virtuallayerprovider) + provider_virtuallayer) install(TARGETS ${QGIS_QUICK_APP_NAME} RUNTIME DESTINATION ${QGIS_BIN_DIR}