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

also rename arcgismapserver target + fix lib names (#43803)

Browse Source
This commit is contained in:
Denis Rouzaud 2021-06-21 09:00:21 +02:00 committed by GitHub
parent b474103812
commit 310f5f37ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
debian/qgis-providers.install vendored
View File

@ -1,25 +1,25 @@
usr/lib/qgis/crssync usr/lib/qgis/crssync
usr/lib/qgis/untwine usr/lib/qgis/untwine
usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so usr/lib/qgis/plugins/libprovider_arcgisfeatureserver.so
usr/lib/qgis/plugins/libarcgismapserverprovider.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/libdb2provider.so usr/lib/qgis/plugins/libprovider_db2.so
usr/lib/qgis/plugins/libdelimitedtextprovider.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/libgeonodeprovider.so usr/lib/qgis/plugins/libprovider_geonode.so
usr/lib/qgis/plugins/libgpxprovider.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/libmdalprovider.so usr/lib/qgis/plugins/libprovider_mdal.so
usr/lib/qgis/plugins/libmssqlprovider.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/libpostgresprovider.so usr/lib/qgis/plugins/libprovider_postgres.so
usr/lib/qgis/plugins/libpostgresrasterprovider.so usr/lib/qgis/plugins/libprovider_postgresraster.so
usr/lib/qgis/plugins/libspatialiteprovider.so usr/lib/qgis/plugins/libprovider_spatialite.so
usr/lib/qgis/plugins/libvirtuallayerprovider.so usr/lib/qgis/plugins/libprovider_virtuallayer.so
usr/lib/qgis/plugins/libwcsprovider.so usr/lib/qgis/plugins/libprovider_wcs.so
usr/lib/qgis/plugins/libwfsprovider.so usr/lib/qgis/plugins/libprovider_wfs.so
usr/lib/qgis/plugins/libwmsprovider.so usr/lib/qgis/plugins/libprovider_wms.so
usr/lib/qgis/plugins/libpdalprovider.so usr/lib/qgis/plugins/libprovider_pdal.so
usr/lib/qgis/plugins/libhanaprovider.so usr/lib/qgis/plugins/libprovider_hana.so
usr/lib/*/qt?/plugins/sqldrivers/libqsqlspatialite.so usr/lib/*/qt?/plugins/sqldrivers/libqsqlspatialite.so

44
ms-windows/osgeo4w/package.cmd
View File

@ -291,28 +291,28 @@ for %%i in (%packages%) do (
"apps/%PACKAGENAME%/bin/qgis_native.dll" ^ "apps/%PACKAGENAME%/bin/qgis_native.dll" ^
"apps/%PACKAGENAME%/bin/qgis_process.exe" ^ "apps/%PACKAGENAME%/bin/qgis_process.exe" ^
"apps/%PACKAGENAME%/doc/" ^ "apps/%PACKAGENAME%/doc/" ^
"apps/%PACKAGENAME%/plugins/authmethod_basic.dll" ^ "apps/%PACKAGENAME%/plugins/authmethod_basic.dll" ^
"apps/%PACKAGENAME%/plugins/delimitedtextprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_delimitedtext.dll" ^
"apps/%PACKAGENAME%/plugins/authmethod_esritoken.dll" ^ "apps/%PACKAGENAME%/plugins/authmethod_esritoken.dll" ^
"apps/%PACKAGENAME%/plugins/geonodeprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_geonode.dll" ^
"apps/%PACKAGENAME%/plugins/gpxprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_gpx.dll" ^
"apps/%PACKAGENAME%/plugins/authmethod_identcert.dll" ^ "apps/%PACKAGENAME%/plugins/authmethod_identcert.dll" ^
"apps/%PACKAGENAME%/plugins/mssqlprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_mssql.dll" ^
"apps/%PACKAGENAME%/plugins/db2provider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_db2.dll" ^
"apps/%PACKAGENAME%/plugins/authmethod_pkcs12.dll" ^ "apps/%PACKAGENAME%/plugins/authmethod_pkcs12.dll" ^
"apps/%PACKAGENAME%/plugins/authmethod_pkipaths.dll" ^ "apps/%PACKAGENAME%/plugins/authmethod_pkipaths.dll" ^
"apps/%PACKAGENAME%/plugins/postgresprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_postgres.dll" ^
"apps/%PACKAGENAME%/plugins/provider_postgresraster.dll" ^ "apps/%PACKAGENAME%/plugins/provider_postgresraster.dll" ^
"apps/%PACKAGENAME%/plugins/spatialiteprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_spatialite.dll" ^
"apps/%PACKAGENAME%/plugins/virtuallayerprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_virtuallayer.dll" ^
"apps/%PACKAGENAME%/plugins/wcsprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_wcs.dll" ^
"apps/%PACKAGENAME%/plugins/wfsprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_wfs.dll" ^
"apps/%PACKAGENAME%/plugins/wmsprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_wms.dll" ^
"apps/%PACKAGENAME%/plugins/arcgismapserverprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_arcgismapserver.dll" ^
"apps/%PACKAGENAME%/plugins/provider_arcgisfeatureserver.dll" ^ "apps/%PACKAGENAME%/plugins/provider_arcgisfeatureserver.dll" ^
"apps/%PACKAGENAME%/plugins/mdalprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_mdal.dll" ^
"apps/%PACKAGENAME%/plugins/hanaprovider.dll" ^ "apps/%PACKAGENAME%/plugins/provider_hana.dll" ^
"apps/%PACKAGENAME%/plugins/authmethod_oauth2.dll" ^ "apps/%PACKAGENAME%/plugins/authmethod_oauth2.dll" ^
"apps/%PACKAGENAME%/resources/qgis.db" ^ "apps/%PACKAGENAME%/resources/qgis.db" ^
"apps/%PACKAGENAME%/resources/spatialite.db" ^ "apps/%PACKAGENAME%/resources/spatialite.db" ^
"apps/%PACKAGENAME%/resources/srs.db" ^ "apps/%PACKAGENAME%/resources/srs.db" ^

8
src/providers/arcgisrest/CMakeLists.txt
View File

@ -65,16 +65,16 @@ set (AMS_SRCS
qgsamsprovider.cpp qgsamsprovider.cpp
) )
add_library(arcgismapserverprovider MODULE ${AMS_SRCS}) add_library(provider_arcgismapserver MODULE ${AMS_SRCS})
# require c++17 # require c++17
target_compile_features(arcgismapserverprovider PRIVATE cxx_std_17) target_compile_features(provider_arcgismapserver PRIVATE cxx_std_17)
target_link_libraries(arcgismapserverprovider target_link_libraries(provider_arcgismapserver
qgis_core qgis_core
${QCA_LIBRARY} ${QCA_LIBRARY}
) )
install (TARGETS arcgismapserverprovider install (TARGETS provider_arcgismapserver
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}) LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})