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

followup ad618e77182

Browse Source
This commit is contained in:
Juergen E. Fischer 2021-06-21 21:39:12 +02:00
parent 3428c49f1c
commit 69530a56a6
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/qgis-provider-grass.install vendored
View File

@ -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.g.info?
usr/lib/qgis/grass/modules/qgis.r.in? usr/lib/qgis/grass/modules/qgis.r.in?
usr/lib/qgis/grass/modules/qgis.v.in? usr/lib/qgis/grass/modules/qgis.v.in?
usr/lib/qgis/plugins/libgrassprovider?.so usr/lib/qgis/plugins/libprovider_grass?.so
usr/lib/qgis/plugins/libgrassrasterprovider?.so usr/lib/qgis/plugins/libprovider_grassraster?.so

20
debian/qgis-providers.install vendored
View File

@ -1,18 +1,20 @@
usr/lib/qgis/crssync usr/lib/qgis/crssync
usr/lib/qgis/untwine 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/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/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/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_pkcs12.so
usr/lib/qgis/plugins/libauthmethod_pkipaths.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_postgres.so
usr/lib/qgis/plugins/libprovider_postgresraster.so usr/lib/qgis/plugins/libprovider_postgresraster.so
usr/lib/qgis/plugins/libprovider_spatialite.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_wcs.so
usr/lib/qgis/plugins/libprovider_wfs.so usr/lib/qgis/plugins/libprovider_wfs.so
usr/lib/qgis/plugins/libprovider_wms.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 usr/lib/*/qt?/plugins/sqldrivers/libqsqlspatialite.so

15
src/providers/virtual/CMakeLists.txt
View File

@ -40,14 +40,11 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} # ui_xxx_dlg.h ${CMAKE_CURRENT_BINARY_DIR} # ui_xxx_dlg.h
) )
include_directories(SYSTEM include_directories(SYSTEM
${POSTGRES_INCLUDE_DIR} ${POSTGRES_INCLUDE_DIR}
) )
add_library(provider_virtuallayer MODULE
add_library(virtuallayerprovider MODULE
${QGIS_VLAYER_PROVIDER_SRCS} ${QGIS_VLAYER_PROVIDER_SRCS}
${QGIS_VLAYER_PROVIDER_HDRS} ${QGIS_VLAYER_PROVIDER_HDRS}
${vlayer_provider_UI_H} ${vlayer_provider_UI_H}
@ -55,9 +52,9 @@ add_library(virtuallayerprovider MODULE
) )
# require c++17 # 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 qgis_core
${Qt5Core_LIBRARIES} ${Qt5Core_LIBRARIES}
${Qt5Gui_LIBRARIES} ${Qt5Gui_LIBRARIES}
@ -67,13 +64,13 @@ target_link_libraries( virtuallayerprovider
) )
if (WITH_GUI) if (WITH_GUI)
target_link_libraries (virtuallayerprovider target_link_libraries (provider_virtuallayer
qgis_gui qgis_gui
) )
add_dependencies(virtuallayerprovider ui) add_dependencies(provider_virtuallayer ui)
endif() endif()
install(TARGETS virtuallayerprovider install(TARGETS provider_virtuallayer
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR} LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}
) )

2
tests/src/quickgui/app/CMakeLists.txt
View File

@ -51,7 +51,7 @@ target_compile_definitions(${QGIS_QUICK_APP_NAME} PRIVATE "-DQT_NO_FOREACH")
add_dependencies(${QGIS_QUICK_APP_NAME} add_dependencies(${QGIS_QUICK_APP_NAME}
qgis_quick_plugin qgis_quick_plugin
provider_spatialite provider_spatialite
virtuallayerprovider) provider_virtuallayer)
install(TARGETS ${QGIS_QUICK_APP_NAME} install(TARGETS ${QGIS_QUICK_APP_NAME}
RUNTIME DESTINATION ${QGIS_BIN_DIR} RUNTIME DESTINATION ${QGIS_BIN_DIR}