Skip to content
Permalink
Browse files
followup ad618e7
  • Loading branch information
jef-n committed Jun 21, 2021
1 parent 3428c49 commit 69530a56a619353e84619705b056397fd95d8cef
Showing with 16 additions and 19 deletions.
  1. +2 −2 debian/qgis-provider-grass.install
  2. +7 −7 debian/qgis-providers.install
  3. +6 −9 src/providers/virtual/CMakeLists.txt
  4. +1 −1 tests/src/quickgui/app/CMakeLists.txt
@@ -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
@@ -1,25 +1,25 @@
usr/lib/qgis/crssync
usr/lib/qgis/untwine
usr/lib/qgis/plugins/libauthmethod_basic.so
usr/lib/qgis/plugins/libauthmethod_esritoken.so
usr/lib/qgis/plugins/libauthmethod_identcert.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/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_hana.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_pdal.so
usr/lib/qgis/plugins/libprovider_postgres.so
usr/lib/qgis/plugins/libprovider_postgresraster.so
usr/lib/qgis/plugins/libprovider_spatialite.so
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
@@ -40,24 +40,21 @@ 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}
${QGIS_VLAYER_SQL_FUNCTIONS_RCCS}
)

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

0 comments on commit 69530a5

Please sign in to comment.