Skip to content

Commit

Permalink
Rename 'qgis_transform' to 'qgis_process'
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Apr 15, 2020
1 parent 019035b commit f9a58d2
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -147,7 +147,7 @@ IF(WITH_CORE)

SET (WITH_QUICK FALSE CACHE BOOL "Determines whether QGIS Quick library should be built")

SET (WITH_TRANSFORM TRUE CACHE BOOL "Determines whether the standalone QGIS transform tool should be built")
SET (WITH_QGIS_PROCESS TRUE CACHE BOOL "Determines whether the standalone \"qgis_process\" tool should be built")

# try to configure and build python bindings by default
SET (WITH_BINDINGS TRUE CACHE BOOL "Determines whether python bindings should be built")
Expand Down
6 changes: 3 additions & 3 deletions src/CMakeLists.txt
Expand Up @@ -46,6 +46,6 @@ IF (WITH_QUICK)
ADD_SUBDIRECTORY(quickgui)
ENDIF (WITH_QUICK)

IF (WITH_TRANSFORM)
ADD_SUBDIRECTORY(transform)
ENDIF (WITH_TRANSFORM)
IF (WITH_QGIS_PROCESS)
ADD_SUBDIRECTORY(process)
ENDIF (WITH_QGIS_PROCESS)
14 changes: 7 additions & 7 deletions src/transform/CMakeLists.txt → src/process/CMakeLists.txt
@@ -1,16 +1,16 @@
########################################################
# Files

SET(QGIS_TRANSFORM_SRCS
SET(QGIS_PROCESS_SRCS
main.cpp
qgstransform.cpp
qgsprocess.cpp
${CMAKE_SOURCE_DIR}/external/qt-unix-signals/sigwatch.cpp
)

########################################################
# Build

ADD_EXECUTABLE (qgis_transform MACOSX_BUNDLE WIN32 ${QGIS_TRANSFORM_SRCS} )
ADD_EXECUTABLE (qgis_process MACOSX_BUNDLE WIN32 ${QGIS_PROCESS_SRCS} )

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
Expand Down Expand Up @@ -49,24 +49,24 @@ IF (WITH_3D)
ENDIF (WITH_3D)

IF (WITH_BINDINGS)
TARGET_LINK_LIBRARIES(qgis_transform qgispython)
TARGET_LINK_LIBRARIES(qgis_process qgispython)
ENDIF(WITH_BINDINGS)

TARGET_LINK_LIBRARIES(qgis_transform
TARGET_LINK_LIBRARIES(qgis_process
qgis_core
qgis_analysis
${Qt5Core_LIBRARIES}
)

IF (WITH_3D)
TARGET_LINK_LIBRARIES(qgis_transform
TARGET_LINK_LIBRARIES(qgis_process
qgis_3d
)
ENDIF (WITH_3D)

# install

INSTALL (TARGETS qgis_transform
INSTALL (TARGETS qgis_process
BUNDLE DESTINATION ${QGIS_BIN_DIR}
RUNTIME DESTINATION ${QGIS_BIN_DIR}
)
Expand Down
2 changes: 1 addition & 1 deletion src/transform/main.cpp → src/process/main.cpp
Expand Up @@ -50,7 +50,7 @@ typedef SInt32 SRefCon;
#endif
#endif

#include "qgstransform.h"
#include "qgsprocess.h"
#include "qgsapplication.h"
#include "qgsproviderregistry.h"

Expand Down
4 changes: 2 additions & 2 deletions src/transform/qgstransform.cpp → src/process/qgsprocess.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
qgstransform.h
qgsprocess.h
-------------------
begin : February 2019
copyright : (C) 2019 Nyall Dawson
Expand All @@ -15,7 +15,7 @@
* *
***************************************************************************/

#include "qgstransform.h"
#include "qgsprocess.h"
#include "qgsprocessingregistry.h"
#include "qgsprocessingalgorithm.h"
#include "qgsnativealgorithms.h"
Expand Down
8 changes: 4 additions & 4 deletions src/transform/qgstransform.h → src/process/qgsprocess.h
@@ -1,5 +1,5 @@
/***************************************************************************
qgstransform.h
qgsprocess.h
-------------------
begin : February 2019
copyright : (C) 2019 Nyall Dawson
Expand All @@ -14,8 +14,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef QGSTRANSFORM_H
#define QGSTRANSFORM_H
#ifndef QGSPROCESS_H
#define QGSPROCESS_H

#include "qgsprocessingfeedback.h"
#include "qgspythonrunner.h"
Expand Down Expand Up @@ -71,5 +71,5 @@ class QgsProcessingExec
std::unique_ptr< QgsPythonUtils > mPythonUtils;
};

#endif // QGSTRANSFORM_H
#endif // QGSPROCESS_H

0 comments on commit f9a58d2

Please sign in to comment.