Skip to content

Commit 61e70c9

Browse files
nyalldawsonnyalldawson
committedSep 12, 2017
Slight folder restructuring
·
ltr-3_40final-3_0_0
1 parent a03e1ee commit 61e70c9

File tree

12 files changed

+16
-13
lines changed

12 files changed

+16
-13
lines changed
 

‎python/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ INCLUDE_DIRECTORIES(
112112
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
113113
${CMAKE_SOURCE_DIR}/src/core/dxf
114114
${CMAKE_SOURCE_DIR}/src/core/geometry
115-
${CMAKE_SOURCE_DIR}/src/core/geonode
115+
${CMAKE_SOURCE_DIR}/src/core/geocms
116+
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
116117
${CMAKE_SOURCE_DIR}/src/core/gps
117118
${CMAKE_SOURCE_DIR}/src/core/layertree
118119
${CMAKE_SOURCE_DIR}/src/core/layout

‎src/app/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ INCLUDE_DIRECTORIES(
516516
${CMAKE_SOURCE_DIR}/src/core/composer
517517
${CMAKE_SOURCE_DIR}/src/core/dxf
518518
${CMAKE_SOURCE_DIR}/src/core/geometry
519-
${CMAKE_SOURCE_DIR}/src/core/geonode
519+
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
520520
${CMAKE_SOURCE_DIR}/src/core/metadata
521521
${CMAKE_SOURCE_DIR}/src/core/layertree
522522
${CMAKE_SOURCE_DIR}/src/core/providers/memory
@@ -563,7 +563,7 @@ INCLUDE_DIRECTORIES(
563563
../core/composer
564564
../core/dxf
565565
../core/geometry
566-
../core/geonode
566+
../core/geocms/geonode
567567
../core/layout
568568
../core/metadata
569569
../core/layertree

‎src/core/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,8 @@ SET(QGIS_CORE_SRCS
466466
fieldformatter/qgsvaluemapfieldformatter.cpp
467467
fieldformatter/qgsvaluerelationfieldformatter.cpp
468468

469-
geonode/qgsgeonodeconnection.cpp
470-
geonode/qgsgeonoderequest.cpp
469+
geocms/geonode/qgsgeonodeconnection.cpp
470+
geocms/geonode/qgsgeonoderequest.cpp
471471

472472
${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp
473473

@@ -683,7 +683,7 @@ SET(QGIS_CORE_MOC_HDRS
683683

684684
geometry/qgspoint.h
685685

686-
geonode/qgsgeonoderequest.h
686+
geocms/geonode/qgsgeonoderequest.h
687687

688688
gps/qgsgpsconnection.h
689689
gps/qgsgpsdetector.h
@@ -1089,7 +1089,7 @@ SET(QGIS_CORE_HDRS
10891089
fieldformatter/qgsvaluemapfieldformatter.h
10901090
fieldformatter/qgsvaluerelationfieldformatter.h
10911091

1092-
geonode/qgsgeonodeconnection.h
1092+
geocms/geonode/qgsgeonodeconnection.h
10931093

10941094
metadata/qgslayermetadata.h
10951095
metadata/qgslayermetadatavalidator.h
@@ -1114,7 +1114,8 @@ INCLUDE_DIRECTORIES(
11141114
${CMAKE_SOURCE_DIR}/src/core/expression
11151115
fieldformatter
11161116
geometry
1117-
geonode
1117+
geocms
1118+
geocms/geonode
11181119
layertree
11191120
layout
11201121
metadata

‎src/gui/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,8 @@ INCLUDE_DIRECTORIES(
843843
${CMAKE_SOURCE_DIR}/src/core/auth
844844
${CMAKE_SOURCE_DIR}/src/core/composer
845845
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
846-
${CMAKE_SOURCE_DIR}/src/core/geonode
846+
${CMAKE_SOURCE_DIR}/src/core/geocms
847+
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
847848
${CMAKE_SOURCE_DIR}/src/core/geometry
848849
${CMAKE_SOURCE_DIR}/src/core/layertree
849850
${CMAKE_SOURCE_DIR}/src/core/layout

‎src/providers/ows/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ INCLUDE_DIRECTORIES (
1313
${CMAKE_SOURCE_DIR}/src/core
1414
${CMAKE_SOURCE_DIR}/src/core/expression
1515
${CMAKE_SOURCE_DIR}/src/core/geometry
16-
${CMAKE_SOURCE_DIR}/src/core/geonode
16+
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
1717
${CMAKE_SOURCE_DIR}/src/core/auth
1818
${CMAKE_SOURCE_DIR}/src/core/metadata
1919
${CMAKE_SOURCE_DIR}/src/gui

‎src/providers/wfs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ INCLUDE_DIRECTORIES (
5050
${CMAKE_SOURCE_DIR}/src/core/expression
5151
${CMAKE_SOURCE_DIR}/src/core/geometry
5252
${CMAKE_SOURCE_DIR}/src/core/symbology # needed by qgsvectorfilewriter.h
53-
${CMAKE_SOURCE_DIR}/src/core/geonode
53+
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
5454
${CMAKE_SOURCE_DIR}/src/core/metadata
5555
${CMAKE_SOURCE_DIR}/src/gui
5656
${CMAKE_SOURCE_DIR}/src/gui/auth

‎src/providers/wms/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ INCLUDE_DIRECTORIES(
3838
${CMAKE_SOURCE_DIR}/src/core/auth
3939
${CMAKE_SOURCE_DIR}/src/core/expression
4040
${CMAKE_SOURCE_DIR}/src/core/geometry
41-
${CMAKE_SOURCE_DIR}/src/core/geonode
41+
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
4242
${CMAKE_SOURCE_DIR}/src/core/raster
4343
${CMAKE_SOURCE_DIR}/src/core/metadata
4444
${CMAKE_SOURCE_DIR}/src/gui

‎tests/src/core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
1414
${CMAKE_SOURCE_DIR}/src/core/expression
1515
${CMAKE_SOURCE_DIR}/src/core/geometry
1616
${CMAKE_SOURCE_DIR}/src/core/layout
17-
${CMAKE_SOURCE_DIR}/src/core/geonode
17+
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
1818
${CMAKE_SOURCE_DIR}/src/core/metadata
1919
${CMAKE_SOURCE_DIR}/src/core/effects
2020
${CMAKE_SOURCE_DIR}/src/core/layertree

0 commit comments

Comments
 (0)
Please sign in to comment.