fix CMakeLists and imports

qgis · Jun 21, 2021 · 0c3f57f · 0c3f57f
1 parent fffc5cc
commit 0c3f57f
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 12 deletions.
diff --git a/python/plugins/CMakeLists.txt b/python/plugins/CMakeLists.txt
@@ -53,6 +53,7 @@ if (WITH_GUI)
 	add_subdirectory(db_manager)
 endif()
 add_subdirectory(processing)
+add_subdirectory(sagaprovider)
 add_subdirectory(MetaSearch)
 
 PY_COMPILE(staged-plugins "${PYTHON_OUTPUT_DIRECTORY}/plugins")
diff --git a/python/plugins/processing/algs/CMakeLists.txt b/python/plugins/processing/algs/CMakeLists.txt
@@ -4,7 +4,6 @@ add_subdirectory(help)
 add_subdirectory(gdal)
 add_subdirectory(grass7)
 add_subdirectory(otb)
-add_subdirectory(saga)
 add_subdirectory(qgis)
 
 PLUGIN_INSTALL(processing algs ${PY_FILES})
diff --git a/python/plugins/processing/core/Processing.py b/python/plugins/processing/core/Processing.py
@@ -65,9 +65,6 @@
 with QgsRuntimeProfiler.profile('Import OTB Provider'):
     from processing.algs.otb.OtbAlgorithmProvider import OtbAlgorithmProvider  # NOQA
 
-with QgsRuntimeProfiler.profile('Import SAGA Provider'):
-    from processing.algs.saga.SagaAlgorithmProvider import SagaAlgorithmProvider  # NOQA
-
 with QgsRuntimeProfiler.profile('Import Script Provider'):
     from processing.script.ScriptAlgorithmProvider import ScriptAlgorithmProvider  # NOQA
 
@@ -120,7 +117,6 @@ def initialize():
                 Grass7AlgorithmProvider,
                 GdalAlgorithmProvider,
                 OtbAlgorithmProvider,
-                SagaAlgorithmProvider,
                 ScriptAlgorithmProvider,
                 ModelerAlgorithmProvider,
                 ProjectProvider

diff --git a/python/plugins/sagaprovider/CMakeLists.txt b/python/plugins/sagaprovider/CMakeLists.txt
@@ -1,7 +1,8 @@
 file(GLOB PY_FILES *.py)
 file(GLOB DESCR_FILES description/*.txt)
+file(GLOB OTHER_FILES metadata.txt)
 
 add_subdirectory(ext)
 
-PLUGIN_INSTALL(processing algs/saga ${PY_FILES})
-PLUGIN_INSTALL(processing algs/saga/description/ ${DESCR_FILES})
+PLUGIN_INSTALL(sagaprovider . ${PY_FILES} ${OTHER_FILES})
+PLUGIN_INSTALL(sagaprovider ./description/ ${DESCR_FILES})
diff --git a/python/plugins/sagaprovider/SagaAlgorithm.py b/python/plugins/sagaprovider/SagaAlgorithm.py
@@ -47,8 +47,8 @@
 from processing.core.ProcessingConfig import ProcessingConfig
 from processing.algs.help import shortHelp
 from processing.tools.system import getTempFilename
-from processing.algs.saga.SagaNameDecorator import decoratedAlgorithmName, decoratedGroupName
-from processing.algs.saga.SagaParameters import Parameters
+from .SagaNameDecorator import decoratedAlgorithmName, decoratedGroupName
+from .SagaParameters import Parameters
 from . import SagaUtils
 from .SagaAlgorithmBase import SagaAlgorithmBase
 

diff --git a/python/plugins/sagaprovider/__init__.py b/python/plugins/sagaprovider/__init__.py
@@ -23,5 +23,5 @@
 
 
 def classFactory(iface):
-    from sagaprovider.sagaproviderplugin import SagaProviderPlugin
+    from sagaprovider.SagaProviderPlugin import SagaProviderPlugin
     return SagaProviderPlugin()
diff --git a/python/plugins/sagaprovider/ext/CMakeLists.txt b/python/plugins/sagaprovider/ext/CMakeLists.txt
@@ -1,3 +1,3 @@
 file(GLOB PY_FILES *.py)
 
-PLUGIN_INSTALL(processing algs/saga/ext ${PY_FILES})
+PLUGIN_INSTALL(sagaprovider ./ext ${PY_FILES})
diff --git a/python/plugins/sagaprovider/metadata.txt b/python/plugins/sagaprovider/metadata.txt
@@ -8,7 +8,7 @@ qgisMinimumVersion=3.0
 
 author=Victor Olaya
 
-icon=:/images/themes/default/processingAlgorithm.svg
+icon=:/images/themes/default/providerSaga.svg
 
 homepage=https://qgis.org
 tracker=https://github.com/qgis/QGIS/issues