mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-29 00:03:59 -04:00
General include cleanup
This unifies the way the include directories are handled in the CMakeLists.txt files. Paths are now normally relative to the root of the source- or build dir. They may still be relative for paths withing a plugin subdirectory but should no longer be relative to paths outside of the current source- or build-directory. The previous approach had resultet in many different styles which are hard to wrap ones head around if new to the build system. It sometimes defined includes twice By using relative paths, it was not possible to copy paste the paths between different files.
This commit is contained in:
parent
ec40199862
commit
82455588c8
@ -93,38 +93,37 @@ INCLUDE_DIRECTORIES(SYSTEM
|
|||||||
${SQLITE3_INCLUDE_DIR}
|
${SQLITE3_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
../src/core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../src/core/annotations
|
${CMAKE_SOURCE_DIR}/src/core/annotations
|
||||||
../src/core/auth
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
../src/core/pal
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../src/core/composer
|
${CMAKE_SOURCE_DIR}/src/core/pal
|
||||||
../src/core/diagram
|
${CMAKE_SOURCE_DIR}/src/core/composer
|
||||||
../src/core/effects
|
${CMAKE_SOURCE_DIR}/src/core/diagram
|
||||||
../src/core/fieldformatter
|
${CMAKE_SOURCE_DIR}/src/core/effects
|
||||||
../src/core/dxf
|
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
|
||||||
../src/core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/dxf
|
||||||
../src/core/gps
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../src/core/layertree
|
${CMAKE_SOURCE_DIR}/src/core/gps
|
||||||
../src/core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/layertree
|
||||||
../src/core/processing
|
${CMAKE_SOURCE_DIR}/src/core/locator
|
||||||
../src/core/providers
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../src/core/providers/memory
|
${CMAKE_SOURCE_DIR}/src/core/processing
|
||||||
../src/core/raster
|
${CMAKE_SOURCE_DIR}/src/core/providers
|
||||||
../src/core/scalebar
|
${CMAKE_SOURCE_DIR}/src/core/providers/memory
|
||||||
../src/core/symbology-ng
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/scalebar
|
||||||
../src/gui
|
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
|
||||||
../src/gui/symbology-ng
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
../src/gui/raster
|
${CMAKE_SOURCE_DIR}/src/gui/symbology-ng
|
||||||
../src/gui/attributetable
|
${CMAKE_SOURCE_DIR}/src/gui/raster
|
||||||
../src/gui/auth
|
${CMAKE_SOURCE_DIR}/src/gui/attributetable
|
||||||
../src/gui/editorwidgets
|
${CMAKE_SOURCE_DIR}/src/gui/auth
|
||||||
../src/gui/editorwidgets/core
|
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
|
||||||
../src/gui/effects
|
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
|
||||||
../src/gui/layertree
|
${CMAKE_SOURCE_DIR}/src/gui/effects
|
||||||
../src/gui/locator
|
${CMAKE_SOURCE_DIR}/src/gui/layertree
|
||||||
|
${CMAKE_SOURCE_DIR}/src/plugins
|
||||||
../src/plugins
|
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
|
${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
|
@ -478,57 +478,56 @@ IF(PEDANTIC)
|
|||||||
ENDIF(PEDANTIC)
|
ENDIF(PEDANTIC)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
${CMAKE_CURRENT_SOURCE_DIR} composer legend pluginmanager
|
${CMAKE_SOURCE_DIR}/src/app
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_SOURCE_DIR}/src/app/composer
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../ui
|
${CMAKE_SOURCE_DIR}/src/app/pluginmanager
|
||||||
|
${CMAKE_SOURCE_DIR}/src/app/gps
|
||||||
|
${CMAKE_SOURCE_DIR}/src/app/openstreetmap
|
||||||
|
${CMAKE_SOURCE_DIR}/src/app/dwg
|
||||||
|
${CMAKE_SOURCE_DIR}/src/app/dwg/libdxfrw
|
||||||
|
${CMAKE_SOURCE_DIR}/src/analysis/raster
|
||||||
|
${CMAKE_SOURCE_DIR}/src/analysis/openstreetmap
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/annotations
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/gps
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/composer
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/dxf
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/layertree
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/locator
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/providers/memory
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/scalebar
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui/symbology-ng
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui/attributetable
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui/auth
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui/raster
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui/layertree
|
||||||
|
${CMAKE_SOURCE_DIR}/src/plugins
|
||||||
|
${CMAKE_SOURCE_DIR}/src/python
|
||||||
|
${CMAKE_SOURCE_DIR}/src/native
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
${CMAKE_BINARY_DIR}/src/python
|
${CMAKE_BINARY_DIR}/src/python
|
||||||
${CMAKE_BINARY_DIR}/src/analysis
|
${CMAKE_BINARY_DIR}/src/analysis
|
||||||
${CMAKE_BINARY_DIR}/src/app
|
${CMAKE_BINARY_DIR}/src/app
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
|
${CMAKE_BINARY_DIR}/src/native
|
||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${QWT_INCLUDE_DIR}
|
${QWT_INCLUDE_DIR}
|
||||||
${QT_QTUITOOLS_INCLUDE_DIR}
|
${QT_QTUITOOLS_INCLUDE_DIR}
|
||||||
${QSCINTILLA_INCLUDE_DIR}
|
${QSCINTILLA_INCLUDE_DIR}
|
||||||
${QEXTSERIALPORT_INCLUDE_DIR}
|
${QEXTSERIALPORT_INCLUDE_DIR}
|
||||||
)
|
|
||||||
INCLUDE_DIRECTORIES(
|
|
||||||
../analysis/raster
|
|
||||||
../analysis/openstreetmap
|
|
||||||
../core
|
|
||||||
../core/annotations
|
|
||||||
../core/auth
|
|
||||||
../core/gps
|
|
||||||
../core/composer
|
|
||||||
../core/dxf
|
|
||||||
../core/geometry
|
|
||||||
../core/metadata
|
|
||||||
../core/layertree
|
|
||||||
../core/providers/memory
|
|
||||||
../core/raster
|
|
||||||
../core/scalebar
|
|
||||||
../core/symbology-ng
|
|
||||||
../gui
|
|
||||||
../gui/symbology-ng
|
|
||||||
../gui/attributetable
|
|
||||||
../gui/auth
|
|
||||||
../gui/locator
|
|
||||||
../gui/raster
|
|
||||||
../gui/editorwidgets
|
|
||||||
../gui/editorwidgets/core
|
|
||||||
../gui/layertree
|
|
||||||
../plugins
|
|
||||||
../python
|
|
||||||
gps
|
|
||||||
openstreetmap
|
|
||||||
dwg
|
|
||||||
dwg/libdxfrw
|
|
||||||
locator
|
|
||||||
${CMAKE_SOURCE_DIR}/src/native
|
|
||||||
${CMAKE_BINARY_DIR}/src/native
|
|
||||||
)
|
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
|
||||||
${SPATIALITE_INCLUDE_DIR}
|
${SPATIALITE_INCLUDE_DIR}
|
||||||
${SQLITE3_INCLUDE_DIR}
|
${SQLITE3_INCLUDE_DIR}
|
||||||
${PROJ_INCLUDE_DIR}
|
${PROJ_INCLUDE_DIR}
|
||||||
|
@ -91,18 +91,18 @@ class CORE_EXPORT QgsComposerMapItem : public QgsComposerObject
|
|||||||
* \param enabled set to true to enable drawing of the item
|
* \param enabled set to true to enable drawing of the item
|
||||||
* \see enabled
|
* \see enabled
|
||||||
*/
|
*/
|
||||||
virtual void setEnabled( const bool enabled ) { mEnabled = enabled; }
|
virtual void setEnabled( const bool enabled );
|
||||||
|
|
||||||
/** Returns whether the item will be drawn
|
/** Returns whether the item will be drawn
|
||||||
* \returns true if item will be drawn on the map
|
* \returns true if item will be drawn on the map
|
||||||
* \see setEnabled
|
* \see setEnabled
|
||||||
*/
|
*/
|
||||||
virtual bool enabled() const { return mEnabled; }
|
virtual bool enabled() const;
|
||||||
|
|
||||||
/** Returns true if the item is drawn using advanced effects, such as blend modes.
|
/** Returns true if the item is drawn using advanced effects, such as blend modes.
|
||||||
* \returns true if item uses advanced effects
|
* \returns true if item uses advanced effects
|
||||||
*/
|
*/
|
||||||
virtual bool usesAdvancedEffects() const { return false; }
|
virtual bool usesAdvancedEffects() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
#include "qgssqlexpressioncompiler.h"
|
#include "qgssqlexpressioncompiler.h"
|
||||||
#include "qgsexpressionnodeimpl.h"
|
#include "qgsexpressionnodeimpl.h"
|
||||||
#include "qgsexpressionfunction.h"
|
#include "qgsexpressionfunction.h"
|
||||||
|
#include "qgsexpression.h"
|
||||||
|
|
||||||
QgsSqlExpressionCompiler::QgsSqlExpressionCompiler( const QgsFields &fields, Flags flags )
|
QgsSqlExpressionCompiler::QgsSqlExpressionCompiler( const QgsFields &fields, Flags flags )
|
||||||
: mResult( None )
|
: mResult( None )
|
||||||
|
@ -17,9 +17,11 @@
|
|||||||
#define QGSSQLEXPRESSIONCOMPILER_H
|
#define QGSSQLEXPRESSIONCOMPILER_H
|
||||||
|
|
||||||
#include "qgis_core.h"
|
#include "qgis_core.h"
|
||||||
#include "qgsexpression.h"
|
|
||||||
#include "qgsfields.h"
|
#include "qgsfields.h"
|
||||||
|
|
||||||
|
class QgsExpression;
|
||||||
|
class QgsExpressionNode;
|
||||||
|
|
||||||
/** \ingroup core
|
/** \ingroup core
|
||||||
* \class QgsSqlExpressionCompiler
|
* \class QgsSqlExpressionCompiler
|
||||||
* \brief Generic expression compiler for translation to provider specific SQL WHERE clauses.
|
* \brief Generic expression compiler for translation to provider specific SQL WHERE clauses.
|
||||||
|
@ -28,16 +28,17 @@ QT5_ADD_RESOURCES(coordinatecapture_RCC_SRCS ${coordinatecapture_RCCS})
|
|||||||
ADD_LIBRARY (coordinatecaptureplugin MODULE ${coordinatecapture_SRCS} ${coordinatecapture_MOC_SRCS} ${coordinatecapture_RCC_SRCS})
|
ADD_LIBRARY (coordinatecaptureplugin MODULE ${coordinatecapture_SRCS} ${coordinatecapture_MOC_SRCS} ${coordinatecapture_RCC_SRCS})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
../../core/raster
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/plugins
|
||||||
..
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${GEOS_INCLUDE_DIR}
|
${GEOS_INCLUDE_DIR}
|
||||||
|
@ -54,19 +54,21 @@ INCLUDE_DIRECTORIES(SYSTEM
|
|||||||
${QT_INCLUDE_DIR}
|
${QT_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/databaseconnection
|
${CMAKE_CURRENT_SOURCE_DIR}/databaseconnection
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/eventbrowser
|
${CMAKE_CURRENT_SOURCE_DIR}/eventbrowser
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/idtool
|
${CMAKE_CURRENT_SOURCE_DIR}/idtool
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../gui
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../core
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../core/raster
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
|
${CMAKE_SOURCE_DIR}/src/plugins
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(evis
|
TARGET_LINK_LIBRARIES(evis
|
||||||
|
@ -86,15 +86,18 @@ QT5_ADD_RESOURCES(geometrychecker_RCC_SRCS ${geometrychecker_RCCS})
|
|||||||
ADD_LIBRARY (geometrycheckerplugin MODULE ${geometrychecker_HDRS} ${geometrychecker_SRCS} ${geometrychecker_MOC_SRCS} ${geometrychecker_RCC_SRCS} ${geometrychecker_UIS_H})
|
ADD_LIBRARY (geometrycheckerplugin MODULE ${geometrychecker_HDRS} ${geometrychecker_SRCS} ${geometrychecker_MOC_SRCS} ${geometrychecker_RCC_SRCS} ${geometrychecker_UIS_H})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../../core/symbology-ng
|
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
..
|
${CMAKE_SOURCE_DIR}/src/plugins
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${GEOS_INCLUDE_DIR}
|
${GEOS_INCLUDE_DIR}
|
||||||
|
@ -74,14 +74,23 @@ ADD_LIBRARY (georefplugin MODULE ${GEOREF_SRCS} ${GEOREF_MOC_SRCS} ${GEOREF_RCC_
|
|||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core ../../core/geometry ../../core/metadata ../../core/raster ../../core/composer
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../gui ../../gui/editorwidgets ../../gui/layertree
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
..
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/composer
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui/layertree
|
||||||
|
${CMAKE_SOURCE_DIR}/src/plugins
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
${CMAKE_BINARY_DIR}/src/app
|
${CMAKE_BINARY_DIR}/src/app
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
|
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${GSL_INCLUDE_DIR}
|
${GSL_INCLUDE_DIR}
|
||||||
|
@ -35,21 +35,22 @@ QT5_ADD_RESOURCES(GPS_RCC_SRCS ${GPS_RCCS})
|
|||||||
ADD_LIBRARY (gpsimporterplugin MODULE ${GPS_SRCS} ${GPS_MOC_SRCS} ${GPS_RCC_SRCS} ${GPS_UIS_H})
|
ADD_LIBRARY (gpsimporterplugin MODULE ${GPS_SRCS} ${GPS_MOC_SRCS} ${GPS_RCC_SRCS} ${GPS_UIS_H})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
${QEXTSERIALPORT_INCLUDE_DIR}
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/gps
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
../../core/gps
|
${CMAKE_SOURCE_DIR}/src/plugins
|
||||||
../../gui
|
|
||||||
..
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${EXPAT_INCLUDE_DIR}
|
${EXPAT_INCLUDE_DIR}
|
||||||
${PROJ_INCLUDE_DIR}
|
${PROJ_INCLUDE_DIR}
|
||||||
|
${QEXTSERIALPORT_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(gpsimporterplugin
|
TARGET_LINK_LIBRARIES(gpsimporterplugin
|
||||||
|
@ -50,17 +50,19 @@ INCLUDE_DIRECTORIES(SYSTEM
|
|||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../../core/layertree
|
${CMAKE_SOURCE_DIR}/src/core/layertree
|
||||||
../../core/raster
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
../../gui/layertree
|
${CMAKE_SOURCE_DIR}/src/gui/layertree
|
||||||
..
|
${CMAKE_SOURCE_DIR}/src/plugins
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
########################################################
|
########################################################
|
||||||
|
@ -36,16 +36,18 @@ INCLUDE_DIRECTORIES(SYSTEM
|
|||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
../../core/raster
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/plugins
|
||||||
..
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(spatialqueryplugin
|
TARGET_LINK_LIBRARIES(spatialqueryplugin
|
||||||
|
@ -42,13 +42,18 @@ INCLUDE_DIRECTORIES(SYSTEM
|
|||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
${CMAKE_BINARY_DIR}/src/ui
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core ../../core/geometry ../../core/metadata ../../core/raster
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
..
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
|
${CMAKE_SOURCE_DIR}/src/plugins
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(topolplugin
|
TARGET_LINK_LIBRARIES(topolplugin
|
||||||
|
@ -1,18 +1,22 @@
|
|||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core/auth
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/raster
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../../gui/auth
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
${GEOS_INCLUDE_DIR}
|
${CMAKE_SOURCE_DIR}/src/gui/auth
|
||||||
${QSCINTILLA_INCLUDE_DIR}
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
)
|
)
|
||||||
|
|
||||||
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
|
${GEOS_INCLUDE_DIR}
|
||||||
|
${QSCINTILLA_INCLUDE_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
SET (AFS_SRCS
|
SET (AFS_SRCS
|
||||||
|
@ -26,17 +26,18 @@ SET(DB2_MOC_HDRS
|
|||||||
QT5_WRAP_CPP(DB2_MOC_SRCS ${DB2_MOC_HDRS})
|
QT5_WRAP_CPP(DB2_MOC_SRCS ${DB2_MOC_HDRS})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
.
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
../../core/auth
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
../../gui/auth
|
${CMAKE_SOURCE_DIR}/src/gui/auth
|
||||||
../../ui
|
${CMAKE_SOURCE_DIR}/src/ui
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
|
@ -19,19 +19,19 @@ SET (DTEXT_MOC_HDRS
|
|||||||
# Build
|
# Build
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES (SYSTEM
|
INCLUDE_DIRECTORIES (SYSTEM
|
||||||
${GEOS_INCLUDE_DIR}
|
${GEOS_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES (
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
|
||||||
)
|
|
||||||
|
|
||||||
QT5_WRAP_CPP(DTEXT_MOC_SRCS ${DTEXT_MOC_HDRS})
|
QT5_WRAP_CPP(DTEXT_MOC_SRCS ${DTEXT_MOC_HDRS})
|
||||||
|
|
||||||
|
@ -9,19 +9,19 @@ SET(GDAL_MOC_HDRS
|
|||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES (
|
INCLUDE_DIRECTORIES (
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core/raster
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES (SYSTEM
|
INCLUDE_DIRECTORIES (SYSTEM
|
||||||
${GDAL_INCLUDE_DIR}
|
${GDAL_INCLUDE_DIR}
|
||||||
# ${PROJ_INCLUDE_DIR}
|
|
||||||
# ${GEOS_INCLUDE_DIR}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
QT5_WRAP_CPP(GDAL_MOC_SRCS ${GDAL_MOC_HDRS})
|
QT5_WRAP_CPP(GDAL_MOC_SRCS ${GDAL_MOC_HDRS})
|
||||||
|
@ -27,12 +27,15 @@ SET(MSSQL_HDRS
|
|||||||
QT5_WRAP_CPP(MSSQL_MOC_SRCS ${MSSQL_MOC_HDRS})
|
QT5_WRAP_CPP(MSSQL_MOC_SRCS ${MSSQL_MOC_HDRS})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
.
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${GDAL_INCLUDE_DIR}
|
${GDAL_INCLUDE_DIR}
|
||||||
@ -41,10 +44,6 @@ INCLUDE_DIRECTORIES(SYSTEM
|
|||||||
${QSCINTILLA_INCLUDE_DIR}
|
${QSCINTILLA_INCLUDE_DIR}
|
||||||
${PROJ_INCLUDE_DIR}
|
${PROJ_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(
|
|
||||||
../../gui
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
ADD_LIBRARY(mssqlprovider MODULE ${MSSQL_SRCS} ${MSSQL_MOC_SRCS} ${MSSQL_HDRS})
|
ADD_LIBRARY(mssqlprovider MODULE ${MSSQL_SRCS} ${MSSQL_MOC_SRCS} ${MSSQL_HDRS})
|
||||||
|
@ -23,7 +23,7 @@ QgsMssqlExpressionCompiler::QgsMssqlExpressionCompiler( QgsMssqlFeatureSource *s
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QgsSqlExpressionCompiler::Result QgsMssqlExpressionCompiler::compileNode( const QgsExpression::Node *node, QString &result )
|
QgsSqlExpressionCompiler::Result QgsMssqlExpressionCompiler::compileNode( const QgsExpressionNode *node, QString &result )
|
||||||
{
|
{
|
||||||
if ( node->nodeType() == QgsExpressionNode::ntBinaryOperator )
|
if ( node->nodeType() == QgsExpressionNode::ntBinaryOperator )
|
||||||
{
|
{
|
||||||
|
@ -27,7 +27,7 @@ class QgsMssqlExpressionCompiler : public QgsSqlExpressionCompiler
|
|||||||
explicit QgsMssqlExpressionCompiler( QgsMssqlFeatureSource *source );
|
explicit QgsMssqlExpressionCompiler( QgsMssqlFeatureSource *source );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual Result compileNode( const QgsExpression::Node *node, QString &result ) override;
|
virtual Result compileNode( const QgsExpressionNode *node, QString &result ) override;
|
||||||
virtual QString quotedValue( const QVariant &value, bool &ok ) override;
|
virtual QString quotedValue( const QVariant &value, bool &ok ) override;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
#include "qgsogrexpressioncompiler.h"
|
#include "qgsogrexpressioncompiler.h"
|
||||||
|
#include "qgsexpressionnodeimpl.h"
|
||||||
#include "qgsogrprovider.h"
|
#include "qgsogrprovider.h"
|
||||||
|
|
||||||
QgsOgrExpressionCompiler::QgsOgrExpressionCompiler( QgsOgrFeatureSource *source )
|
QgsOgrExpressionCompiler::QgsOgrExpressionCompiler( QgsOgrFeatureSource *source )
|
||||||
@ -45,13 +46,13 @@ QgsSqlExpressionCompiler::Result QgsOgrExpressionCompiler::compile( const QgsExp
|
|||||||
return QgsSqlExpressionCompiler::compile( exp );
|
return QgsSqlExpressionCompiler::compile( exp );
|
||||||
}
|
}
|
||||||
|
|
||||||
QgsSqlExpressionCompiler::Result QgsOgrExpressionCompiler::compileNode( const QgsExpression::Node *node, QString &result )
|
QgsSqlExpressionCompiler::Result QgsOgrExpressionCompiler::compileNode( const QgsExpressionNode *node, QString &result )
|
||||||
{
|
{
|
||||||
switch ( node->nodeType() )
|
switch ( node->nodeType() )
|
||||||
{
|
{
|
||||||
case QgsExpressionNode::ntBinaryOperator:
|
case QgsExpressionNode::ntBinaryOperator:
|
||||||
{
|
{
|
||||||
switch ( static_cast<const QgsExpression::NodeBinaryOperator *>( node )->op() )
|
switch ( static_cast<const QgsExpressionNodeBinaryOperator *>( node )->op() )
|
||||||
{
|
{
|
||||||
case QgsExpressionNodeBinaryOperator::boILike:
|
case QgsExpressionNodeBinaryOperator::boILike:
|
||||||
case QgsExpressionNodeBinaryOperator::boNotILike:
|
case QgsExpressionNodeBinaryOperator::boNotILike:
|
||||||
|
@ -16,10 +16,12 @@
|
|||||||
#ifndef QGSOGREXPRESSIONCOMPILER_H
|
#ifndef QGSOGREXPRESSIONCOMPILER_H
|
||||||
#define QGSOGREXPRESSIONCOMPILER_H
|
#define QGSOGREXPRESSIONCOMPILER_H
|
||||||
|
|
||||||
#include "qgsexpression.h"
|
|
||||||
#include "qgsogrfeatureiterator.h"
|
#include "qgsogrfeatureiterator.h"
|
||||||
#include "qgssqlexpressioncompiler.h"
|
#include "qgssqlexpressioncompiler.h"
|
||||||
|
|
||||||
|
class QgsExpressionNode;
|
||||||
|
class QgsExpression;
|
||||||
|
|
||||||
class QgsOgrExpressionCompiler : public QgsSqlExpressionCompiler
|
class QgsOgrExpressionCompiler : public QgsSqlExpressionCompiler
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
@ -30,7 +32,7 @@ class QgsOgrExpressionCompiler : public QgsSqlExpressionCompiler
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
virtual Result compileNode( const QgsExpression::Node *node, QString &str ) override;
|
virtual Result compileNode( const QgsExpressionNode *node, QString &str ) override;
|
||||||
virtual QString quotedIdentifier( const QString &identifier ) override;
|
virtual QString quotedIdentifier( const QString &identifier ) override;
|
||||||
virtual QString quotedValue( const QVariant &value, bool &ok ) override;
|
virtual QString quotedValue( const QVariant &value, bool &ok ) override;
|
||||||
virtual QString castToReal( const QString &value ) const override;
|
virtual QString castToReal( const QString &value ) const override;
|
||||||
|
@ -39,20 +39,18 @@ SET(ORACLE_HDRS
|
|||||||
QT5_WRAP_CPP(ORACLE_MOC_SRCS ${ORACLE_MOC_HDRS})
|
QT5_WRAP_CPP(ORACLE_MOC_SRCS ${ORACLE_MOC_HDRS})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${GEOS_INCLUDE_DIR}
|
${GEOS_INCLUDE_DIR}
|
||||||
)
|
|
||||||
INCLUDE_DIRECTORIES(
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
|
||||||
)
|
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
|
||||||
${QT_QTSQL_INCLUDEDIR}
|
${QT_QTSQL_INCLUDEDIR}
|
||||||
${QSCINTILLA_INCLUDE_DIR}
|
${QSCINTILLA_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
@ -21,23 +21,23 @@ QgsOracleExpressionCompiler::QgsOracleExpressionCompiler( QgsOracleFeatureSource
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
QgsSqlExpressionCompiler::Result QgsOracleExpressionCompiler::compileNode( const QgsExpression::Node *node, QString &result )
|
QgsSqlExpressionCompiler::Result QgsOracleExpressionCompiler::compileNode( const QgsExpressionNode *node, QString &result )
|
||||||
{
|
{
|
||||||
if ( node->nodeType() == QgsExpression::ntBinaryOperator )
|
if ( node->nodeType() == QgsExpressionNode::ntBinaryOperator )
|
||||||
{
|
{
|
||||||
const QgsExpression::NodeBinaryOperator *bin( static_cast<const QgsExpression::NodeBinaryOperator *>( node ) );
|
const QgsExpressionNodeBinaryOperator *bin( static_cast<const QgsExpressionNodeBinaryOperator *>( node ) );
|
||||||
|
|
||||||
switch ( bin->op() )
|
switch ( bin->op() )
|
||||||
{
|
{
|
||||||
case QgsExpression::boConcat:
|
case QgsExpressionNodeBinaryOperator::boConcat:
|
||||||
// oracle's handling of || WRT null is not standards compliant
|
// oracle's handling of || WRT null is not standards compliant
|
||||||
return Fail;
|
return Fail;
|
||||||
|
|
||||||
case QgsExpression::boPow:
|
case QgsExpressionNodeBinaryOperator::boPow:
|
||||||
case QgsExpression::boRegexp:
|
case QgsExpressionNodeBinaryOperator::boRegexp:
|
||||||
case QgsExpression::boILike:
|
case QgsExpressionNodeBinaryOperator::boILike:
|
||||||
case QgsExpression::boNotILike:
|
case QgsExpressionNodeBinaryOperator::boNotILike:
|
||||||
case QgsExpression::boMod:
|
case QgsExpressionNodeBinaryOperator::boMod:
|
||||||
{
|
{
|
||||||
QString op1, op2;
|
QString op1, op2;
|
||||||
|
|
||||||
@ -47,23 +47,23 @@ QgsSqlExpressionCompiler::Result QgsOracleExpressionCompiler::compileNode( const
|
|||||||
|
|
||||||
switch ( bin->op() )
|
switch ( bin->op() )
|
||||||
{
|
{
|
||||||
case QgsExpression::boPow:
|
case QgsExpressionNodeBinaryOperator::boPow:
|
||||||
result = QString( "power(%1,%2)" ).arg( op1, op2 );
|
result = QString( "power(%1,%2)" ).arg( op1, op2 );
|
||||||
return Complete;
|
return Complete;
|
||||||
|
|
||||||
case QgsExpression::boRegexp:
|
case QgsExpressionNodeBinaryOperator::boRegexp:
|
||||||
result = QString( "regexp_like(%1,%2)" ).arg( op1, op2 );
|
result = QString( "regexp_like(%1,%2)" ).arg( op1, op2 );
|
||||||
return Complete;
|
return Complete;
|
||||||
|
|
||||||
case QgsExpression::boILike:
|
case QgsExpressionNodeBinaryOperator::boILike:
|
||||||
result = QString( "lower(%1) LIKE lower(%2)" ).arg( op1, op2 );
|
result = QString( "lower(%1) LIKE lower(%2)" ).arg( op1, op2 );
|
||||||
return Complete;
|
return Complete;
|
||||||
|
|
||||||
case QgsExpression::boNotILike:
|
case QgsExpressionNodeBinaryOperator::boNotILike:
|
||||||
result = QString( "NOT lower(%1) LIKE lower(%2)" ).arg( op1, op2 );
|
result = QString( "NOT lower(%1) LIKE lower(%2)" ).arg( op1, op2 );
|
||||||
return Complete;
|
return Complete;
|
||||||
|
|
||||||
case QgsExpression::boMod :
|
case QgsExpressionNodeBinaryOperator::boMod :
|
||||||
result = QString( "MOD(%1,%2)" ).arg( op1, op2 );
|
result = QString( "MOD(%1,%2)" ).arg( op1, op2 );
|
||||||
return Complete;
|
return Complete;
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ class QgsOracleExpressionCompiler : public QgsSqlExpressionCompiler
|
|||||||
explicit QgsOracleExpressionCompiler( QgsOracleFeatureSource *source );
|
explicit QgsOracleExpressionCompiler( QgsOracleFeatureSource *source );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual Result compileNode( const QgsExpression::Node *node, QString &result ) override;
|
virtual Result compileNode( const QgsExpressionNode *node, QString &result ) override;
|
||||||
virtual QString quotedIdentifier( const QString &identifier ) override;
|
virtual QString quotedIdentifier( const QString &identifier ) override;
|
||||||
virtual QString quotedValue( const QVariant &value, bool &ok ) override;
|
virtual QString quotedValue( const QVariant &value, bool &ok ) override;
|
||||||
};
|
};
|
||||||
|
@ -8,15 +8,17 @@ SET(OWS_MOC_HDRS
|
|||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES (
|
INCLUDE_DIRECTORIES (
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/auth
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../../gui/auth
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
${CMAKE_SOURCE_DIR}/src/gui/auth
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${PROJ_INCLUDE_DIR}
|
${PROJ_INCLUDE_DIR}
|
||||||
|
@ -38,13 +38,19 @@ SET(PG_HDRS
|
|||||||
QT5_WRAP_CPP(PG_MOC_SRCS ${PG_MOC_HDRS})
|
QT5_WRAP_CPP(PG_MOC_SRCS ${PG_MOC_HDRS})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core/auth
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui/auth
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${POSTGRES_INCLUDE_DIR}
|
${POSTGRES_INCLUDE_DIR}
|
||||||
${GEOS_INCLUDE_DIR}
|
${GEOS_INCLUDE_DIR}
|
||||||
@ -52,14 +58,6 @@ INCLUDE_DIRECTORIES(SYSTEM
|
|||||||
${QCA_INCLUDE_DIR}
|
${QCA_INCLUDE_DIR}
|
||||||
${QTKEYCHAIN_INCLUDE_DIR}
|
${QTKEYCHAIN_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(
|
|
||||||
../../core
|
|
||||||
../../gui
|
|
||||||
../../gui/auth
|
|
||||||
../../ui
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_LIBRARY (postgresprovider_a STATIC ${PG_SRCS} ${PG_HDRS} ${PG_MOC_SRCS})
|
ADD_LIBRARY (postgresprovider_a STATIC ${PG_SRCS} ${PG_HDRS} ${PG_MOC_SRCS})
|
||||||
ADD_LIBRARY (postgresprovider MODULE ${PG_SRCS} ${PG_HDRS} ${PG_MOC_SRCS})
|
ADD_LIBRARY (postgresprovider MODULE ${PG_SRCS} ${PG_HDRS} ${PG_MOC_SRCS})
|
||||||
|
|
||||||
|
@ -144,15 +144,15 @@ QString QgsPostgresExpressionCompiler::castToInt( const QString &value ) const
|
|||||||
return QStringLiteral( "((%1)::int)" ).arg( value );
|
return QStringLiteral( "((%1)::int)" ).arg( value );
|
||||||
}
|
}
|
||||||
|
|
||||||
QgsSqlExpressionCompiler::Result QgsPostgresExpressionCompiler::compileNode( const QgsExpression::Node *node, QString &result )
|
QgsSqlExpressionCompiler::Result QgsPostgresExpressionCompiler::compileNode( const QgsExpressionNode *node, QString &result )
|
||||||
{
|
{
|
||||||
switch ( node->nodeType() )
|
switch ( node->nodeType() )
|
||||||
{
|
{
|
||||||
case QgsExpression::ntFunction:
|
case QgsExpressionNode::ntFunction:
|
||||||
{
|
{
|
||||||
const QgsExpression::NodeFunction *n = static_cast<const QgsExpression::NodeFunction *>( node );
|
const QgsExpressionNodeFunction *n = static_cast<const QgsExpressionNodeFunction *>( node );
|
||||||
|
|
||||||
QgsExpression::Function *fd = QgsExpression::Functions()[n->fnIndex()];
|
QgsExpressionFunction *fd = QgsExpression::Functions()[n->fnIndex()];
|
||||||
if ( fd->name() == "$geometry" )
|
if ( fd->name() == "$geometry" )
|
||||||
{
|
{
|
||||||
result = quotedIdentifier( mGeometryColumn );
|
result = quotedIdentifier( mGeometryColumn );
|
||||||
|
@ -31,7 +31,7 @@ class QgsPostgresExpressionCompiler : public QgsSqlExpressionCompiler
|
|||||||
|
|
||||||
virtual QString quotedIdentifier( const QString &identifier ) override;
|
virtual QString quotedIdentifier( const QString &identifier ) override;
|
||||||
virtual QString quotedValue( const QVariant &value, bool &ok ) override;
|
virtual QString quotedValue( const QVariant &value, bool &ok ) override;
|
||||||
virtual Result compileNode( const QgsExpression::Node *node, QString &str ) override;
|
virtual Result compileNode( const QgsExpressionNode *node, QString &str ) override;
|
||||||
virtual QString sqlFunctionFromFunctionName( const QString &fnName ) const override;
|
virtual QString sqlFunctionFromFunctionName( const QString &fnName ) const override;
|
||||||
virtual QStringList sqlArgumentsFromFunctionName( const QString &fnName, const QStringList &fnArgs ) const override;
|
virtual QStringList sqlArgumentsFromFunctionName( const QString &fnName, const QStringList &fnArgs ) const override;
|
||||||
virtual QString castToReal( const QString &value ) const override;
|
virtual QString castToReal( const QString &value ) const override;
|
||||||
|
@ -34,13 +34,15 @@ INCLUDE_DIRECTORIES(SYSTEM
|
|||||||
${QSCINTILLA_INCLUDE_DIR}
|
${QSCINTILLA_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${SQLITE3_INCLUDE_DIR}
|
${SQLITE3_INCLUDE_DIR}
|
||||||
|
@ -28,14 +28,21 @@ SET(QGIS_VLAYER_PROVIDER_SRCS
|
|||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
.
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
../../core/auth
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui/auth
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
|
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR} # ui_xxx_dlg.h
|
||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${POSTGRES_INCLUDE_DIR}
|
${POSTGRES_INCLUDE_DIR}
|
||||||
${SQLITE3_INCLUDE_DIR}
|
${SQLITE3_INCLUDE_DIR}
|
||||||
@ -44,14 +51,6 @@ INCLUDE_DIRECTORIES(SYSTEM
|
|||||||
${QSCINTILLA_INCLUDE_DIR}
|
${QSCINTILLA_INCLUDE_DIR}
|
||||||
${QCA_INCLUDE_DIR}
|
${QCA_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(
|
|
||||||
../../core
|
|
||||||
../../gui
|
|
||||||
../../gui/auth
|
|
||||||
../../ui
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_LIBRARY(virtuallayerprovider MODULE
|
ADD_LIBRARY(virtuallayerprovider MODULE
|
||||||
${QGIS_VLAYER_PROVIDER_SRCS}
|
${QGIS_VLAYER_PROVIDER_SRCS}
|
||||||
|
@ -17,18 +17,19 @@ SET (WCS_MOC_HDRS
|
|||||||
QT5_WRAP_CPP (WCS_MOC_SRCS ${WCS_MOC_HDRS})
|
QT5_WRAP_CPP (WCS_MOC_SRCS ${WCS_MOC_HDRS})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
.
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
../../core/auth
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/raster
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
../../gui/auth
|
${CMAKE_SOURCE_DIR}/src/gui/auth
|
||||||
../gdal
|
${CMAKE_SOURCE_DIR}/src/providers/gdal
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${GDAL_INCLUDE_DIR}
|
${GDAL_INCLUDE_DIR}
|
||||||
|
@ -37,16 +37,18 @@ SET (WFS_MOC_HDRS
|
|||||||
QT5_WRAP_CPP(WFS_MOC_SRCS ${WFS_MOC_HDRS})
|
QT5_WRAP_CPP(WFS_MOC_SRCS ${WFS_MOC_HDRS})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES (
|
INCLUDE_DIRECTORIES (
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core/auth
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/symbology-ng # needed by qgsvectorfilewriter.h
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/symbology-ng # needed by qgsvectorfilewriter.h
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../../gui/auth
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
${CMAKE_SOURCE_DIR}/src/gui/auth
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${GEOS_INCLUDE_DIR}
|
${GEOS_INCLUDE_DIR}
|
||||||
|
@ -27,15 +27,16 @@ SET (WMS_MOC_HDRS
|
|||||||
QT5_WRAP_CPP (WMS_MOC_SRCS ${WMS_MOC_HDRS})
|
QT5_WRAP_CPP (WMS_MOC_SRCS ${WMS_MOC_HDRS})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
.
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../../core
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
../../core/auth
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../../core/raster
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
../../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../../gui
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
../../gui/auth
|
${CMAKE_SOURCE_DIR}/src/gui/auth
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../ui
|
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
)
|
)
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
SET(QGISPYTHON_SRCS qgispython.cpp qgspythonutilsimpl.cpp)
|
SET(QGISPYTHON_SRCS qgispython.cpp qgspythonutilsimpl.cpp)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
../core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
../core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
../core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
../core/raster
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
../gui
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/python
|
${CMAKE_BINARY_DIR}/src/python
|
||||||
)
|
)
|
||||||
|
@ -17,12 +17,14 @@ QT5_WRAP_CPP (BENCH_MOC_SRCS ${BENCH_MOC_HDRS})
|
|||||||
|
|
||||||
ADD_EXECUTABLE (qgis_bench MACOSX_BUNDLE WIN32 ${BENCH_SRCS} ${BENCH_MOC_SRCS} )
|
ADD_EXECUTABLE (qgis_bench MACOSX_BUNDLE WIN32 ${BENCH_SRCS} ${BENCH_MOC_SRCS} )
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
|
INCLUDE_DIRECTORIES(
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/raster
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
|
|
||||||
|
${CMAKE_BINARY_DIR}
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
|
@ -9,6 +9,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
|
|||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
${CMAKE_SOURCE_DIR}/src/core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
${CMAKE_SOURCE_DIR}/src/core/auth
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
${CMAKE_SOURCE_DIR}/src/core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
${CMAKE_SOURCE_DIR}/src/core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
${CMAKE_SOURCE_DIR}/src/core/raster
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
@ -17,6 +18,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
|
|||||||
${CMAKE_SOURCE_DIR}/src/analysis/vector
|
${CMAKE_SOURCE_DIR}/src/analysis/vector
|
||||||
${CMAKE_SOURCE_DIR}/src/analysis/raster
|
${CMAKE_SOURCE_DIR}/src/analysis/raster
|
||||||
${CMAKE_SOURCE_DIR}/src/test
|
${CMAKE_SOURCE_DIR}/src/test
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/analysis
|
${CMAKE_BINARY_DIR}/src/analysis
|
||||||
)
|
)
|
||||||
|
@ -1,31 +1,34 @@
|
|||||||
#####################################################
|
#####################################################
|
||||||
# Don't forget to include output directory, otherwise
|
# Don't forget to include output directory, otherwise
|
||||||
# the UI file won't be wrapped!
|
# the UI file won't be wrapped!
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
|
INCLUDE_DIRECTORIES(
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/auth
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/composer
|
${CMAKE_SOURCE_DIR}/src/core/composer
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/raster
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/symbology-ng
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../../src/ui
|
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/ui
|
${CMAKE_SOURCE_DIR}/src/ui
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/editorwidgets
|
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/editorwidgets/core
|
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/attributetable
|
${CMAKE_SOURCE_DIR}/src/gui/attributetable
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/symbology-ng
|
${CMAKE_SOURCE_DIR}/src/gui/symbology-ng
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/raster
|
${CMAKE_SOURCE_DIR}/src/gui/raster
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/python
|
${CMAKE_SOURCE_DIR}/src/python
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/app
|
${CMAKE_SOURCE_DIR}/src/app
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/app/pluginmanager
|
${CMAKE_SOURCE_DIR}/src/app/pluginmanager
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/test
|
${CMAKE_SOURCE_DIR}/src/test
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
${CMAKE_BINARY_DIR}/src/python
|
${CMAKE_BINARY_DIR}/src/python
|
||||||
${CMAKE_BINARY_DIR}/src/app
|
${CMAKE_BINARY_DIR}/src/app
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${QT_INCLUDE_DIR}
|
${QT_INCLUDE_DIR}
|
||||||
|
@ -6,25 +6,28 @@ SET (util_SRCS)
|
|||||||
# Don't forget to include output directory, otherwise
|
# Don't forget to include output directory, otherwise
|
||||||
# the UI file won't be wrapped!
|
# the UI file won't be wrapped!
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_SOURCE_DIR}/tests/core #for render checker class
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../../src/ui
|
${CMAKE_SOURCE_DIR}/src/gui
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../core #for render checker class
|
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui
|
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/editorwidgets
|
${CMAKE_SOURCE_DIR}/src/gui/symbology-ng
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/editorwidgets/core
|
${CMAKE_SOURCE_DIR}/src/gui/raster
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/symbology-ng
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/raster
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/auth
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/raster
|
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/symbology-ng
|
${CMAKE_SOURCE_DIR}/src/test
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/test
|
|
||||||
${CMAKE_SOURCE_DIR}/src/native
|
${CMAKE_SOURCE_DIR}/src/native
|
||||||
${CMAKE_BINARY_DIR}/src/native
|
|
||||||
|
|
||||||
${CMAKE_BINARY_DIR}/src/core
|
${CMAKE_BINARY_DIR}/src/core
|
||||||
${CMAKE_BINARY_DIR}/src/gui
|
${CMAKE_BINARY_DIR}/src/gui
|
||||||
|
${CMAKE_BINARY_DIR}/src/ui
|
||||||
|
${CMAKE_BINARY_DIR}/src/native
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
INCLUDE_DIRECTORIES(SYSTEM
|
INCLUDE_DIRECTORIES(SYSTEM
|
||||||
${QT_INCLUDE_DIR}
|
${QT_INCLUDE_DIR}
|
||||||
|
@ -7,6 +7,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
|
|||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
${CMAKE_SOURCE_DIR}/src/core
|
${CMAKE_SOURCE_DIR}/src/core
|
||||||
${CMAKE_SOURCE_DIR}/src/core/auth
|
${CMAKE_SOURCE_DIR}/src/core/auth
|
||||||
|
${CMAKE_SOURCE_DIR}/src/core/expression
|
||||||
${CMAKE_SOURCE_DIR}/src/core/geometry
|
${CMAKE_SOURCE_DIR}/src/core/geometry
|
||||||
${CMAKE_SOURCE_DIR}/src/core/metadata
|
${CMAKE_SOURCE_DIR}/src/core/metadata
|
||||||
${CMAKE_SOURCE_DIR}/src/core/raster
|
${CMAKE_SOURCE_DIR}/src/core/raster
|
||||||
|
Loading…
x
Reference in New Issue
Block a user