Skip to content
Permalink
Browse files
also rename grassrasterprovider
  • Loading branch information
jef-n committed Jun 25, 2021
1 parent 65676da commit f14e098eb6e1fca7014a2a4439481dff7555a942
Showing with 9 additions and 9 deletions.
  1. +2 −2 ms-windows/osgeo4w/package.cmd
  2. +2 −2 rpm/qgis.spec.template
  3. +5 −5 src/providers/grass/CMakeLists.txt
@@ -443,8 +443,8 @@ for %%g IN (%GRASS_VERSIONS%) do (
"apps/%PACKAGENAME%/grass/modules/qgis.r.in!v!.exe" ^
"apps/%PACKAGENAME%/grass/modules/qgis.v.in!v!.exe" ^
"apps/%PACKAGENAME%/plugins/grassplugin!v!.dll" ^
"apps/%PACKAGENAME%/plugins/grassprovider!v!.dll" ^
"apps/%PACKAGENAME%/plugins/grassrasterprovider!v!.dll" ^
"apps/%PACKAGENAME%/plugins/provider_grass!v!.dll" ^
"apps/%PACKAGENAME%/plugins/provider_grassraster!v!.dll" ^
"bin/%PACKAGENAME%-grass!v!.bat.tmpl" ^
"etc/postinstall/%PACKAGENAME%-grass-plugin!w!.bat" ^
"etc/preremove/%PACKAGENAME%-grass-plugin!w!.bat"
@@ -312,7 +312,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL*
%{_datadir}/%{name}/svg/
%exclude %{_libdir}/libqgisgrass*.so.*
%exclude %{_libdir}/%{name}/plugins/libgrassplugin*.so
%exclude %{_libdir}/%{name}/plugins/libgrassrasterprovider*.so
%exclude %{_libdir}/%{name}/plugins/libprovider_grassraster*.so
%exclude %{_libdir}/%{name}/plugins/libprovider_grass*.so
%exclude %{_libdir}/%{name}/server/
%exclude %{_libdir}/%{name}/grass/
@@ -328,7 +328,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL*
%files grass
%{_libdir}/lib%{name}grass*.so.*
%{_libdir}/%{name}/plugins/libgrassplugin*.so
%{_libdir}/%{name}/plugins/libgrassrasterprovider*.so
%{_libdir}/%{name}/plugins/libprovider_grassraster*.so
%{_libdir}/%{name}/plugins/libprovider_grass*.so
%{_libdir}/%{name}/grass/
%{_datadir}/%{name}/grass/
@@ -182,15 +182,15 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION)
set (GRASS_RASTER_PROVIDER_SRCS
../qgsgrassrasterprovidermodule.cpp
)
add_library(grassrasterprovider${GRASS_BUILD_VERSION} MODULE ${GRASS_RASTER_PROVIDER_SRCS})
add_library(provider_grassraster${GRASS_BUILD_VERSION} MODULE ${GRASS_RASTER_PROVIDER_SRCS})

# require c++17
target_compile_features(grassrasterprovider${GRASS_BUILD_VERSION} PRIVATE cxx_std_17)
target_compile_features(provider_grassraster${GRASS_BUILD_VERSION} PRIVATE cxx_std_17)

set_target_properties(grassrasterprovider${GRASS_BUILD_VERSION} PROPERTIES
set_target_properties(provider_grassraster${GRASS_BUILD_VERSION} PROPERTIES
COMPILE_FLAGS "-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\""
)
target_link_libraries(grassrasterprovider${GRASS_BUILD_VERSION}
target_link_libraries(provider_grassraster${GRASS_BUILD_VERSION}
qgisgrass${GRASS_BUILD_VERSION}
qgis_core
)
@@ -298,7 +298,7 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION)
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})

install(TARGETS grassrasterprovider${GRASS_BUILD_VERSION}
install(TARGETS provider_grassraster${GRASS_BUILD_VERSION}
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})

0 comments on commit f14e098

Please sign in to comment.