Skip to content
Permalink
Browse files
fix CMakeLists and imports
  • Loading branch information
alexbruy committed Jun 21, 2021
1 parent fffc5cc commit 0c3f57fb860c39783dfe82c6fe48367feb536f81
@@ -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")
@@ -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})
@@ -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
@@ -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})
@@ -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

@@ -23,5 +23,5 @@


def classFactory(iface):
from sagaprovider.sagaproviderplugin import SagaProviderPlugin
from sagaprovider.SagaProviderPlugin import SagaProviderPlugin
return SagaProviderPlugin()
@@ -1,3 +1,3 @@
file(GLOB PY_FILES *.py)

PLUGIN_INSTALL(processing algs/saga/ext ${PY_FILES})
PLUGIN_INSTALL(sagaprovider ./ext ${PY_FILES})
@@ -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

0 comments on commit 0c3f57f

Please sign in to comment.