File tree 20 files changed +107
-76
lines changed
20 files changed +107
-76
lines changed Original file line number Diff line number Diff line change @@ -467,23 +467,27 @@ ADD_CUSTOM_TARGET(version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h)
467
467
#############################################################
468
468
# process subdirs
469
469
470
- SUBDIRS (src doc images resources i18n)
470
+ ADD_SUBDIRECTORY (src)
471
+ ADD_SUBDIRECTORY (doc )
472
+ ADD_SUBDIRECTORY (images)
473
+ ADD_SUBDIRECTORY (resources)
474
+ ADD_SUBDIRECTORY (i18n)
471
475
472
476
IF (WITH_BINDINGS)
473
- SUBDIRS (python)
477
+ ADD_SUBDIRECTORY (python)
474
478
ENDIF (WITH_BINDINGS)
475
479
476
480
IF (ENABLE_TESTS)
477
481
#create a variable to specify where our test data is
478
482
#so that unit tests can use TEST_DATA_DIR to locate
479
483
#the test data. See CMakeLists in test dirs for more info
480
484
SET (TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR} /tests/testdata" )
481
- SUBDIRS (tests)
485
+ ADD_SUBDIRECTORY (tests)
482
486
ENDIF (ENABLE_TESTS)
483
487
484
488
IF (APPLE )
485
489
# must be last for install, so install_name_tool can do its work
486
- SUBDIRS (mac)
490
+ ADD_SUBDIRECTORY (mac)
487
491
ENDIF (APPLE )
488
492
489
493
# manual page - makes sense only on unix systems
Original file line number Diff line number Diff line change 1
- ########################################################
2
- # Files
3
-
4
- SET (IMAGE_RCCS images.qrc)
5
-
6
- ########################################################
7
- # Build
8
-
9
- QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS} )
10
-
11
- ########################################################
12
- # Continue on to subdirs
13
- SUBDIRS (north_arrows splash icons themes svg)
1
+ ########################################################
2
+ # Files
3
+
4
+ SET (IMAGE_RCCS images.qrc)
5
+
6
+ ########################################################
7
+ # Build
8
+
9
+ QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS} )
10
+
11
+ ########################################################
12
+ # Continue on to subdirs
13
+ ADD_SUBDIRECTORY (north_arrows)
14
+ ADD_SUBDIRECTORY (splash)
15
+ ADD_SUBDIRECTORY (icons)
16
+ ADD_SUBDIRECTORY (themes)
17
+ ADD_SUBDIRECTORY (svg)
Original file line number Diff line number Diff line change 1
- SUBDIRS (plugins)
1
+ ADD_SUBDIRECTORY (plugins)
2
2
3
3
FILE (GLOB IMAGES *.png)
4
4
Original file line number Diff line number Diff line change 1
- SUBDIRS (coordinate_capture)
1
+ ADD_SUBDIRECTORY (coordinate_capture)
2
2
3
3
FILE (GLOB IMAGES *.png)
4
4
Original file line number Diff line number Diff line change 1
- SUBDIRS (plugins)
1
+ ADD_SUBDIRECTORY (plugins)
2
2
3
3
IF (WITH_INTERNAL_SPATIALITE)
4
- SUBDIRS (pyspatialite)
4
+ ADD_SUBDIRECTORY (pyspatialite)
5
5
6
6
INCLUDE_DIRECTORIES (
7
7
../src/core/spatialite/headers
@@ -51,7 +51,7 @@ ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
51
51
52
52
# core module
53
53
FILE (GLOB sip_files_core core/*.sip)
54
- set (SIP_EXTRA_FILES_DEPEND ${sip_files_core} )
54
+ SET (SIP_EXTRA_FILES_DEPEND ${sip_files_core} )
55
55
ADD_SIP_PYTHON_MODULE(qgis.core core/core.sip qgis_core)
56
56
57
57
# additional gui includes
@@ -65,7 +65,7 @@ INCLUDE_DIRECTORIES(
65
65
66
66
# gui module
67
67
FILE (GLOB sip_files_gui gui/*.sip)
68
- set (SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui} )
68
+ SET (SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui} )
69
69
ADD_SIP_PYTHON_MODULE(qgis.gui gui/gui.sip qgis_core qgis_gui)
70
70
71
71
# additional analysis includes
@@ -76,7 +76,7 @@ INCLUDE_DIRECTORIES(
76
76
77
77
# analysis module
78
78
FILE (GLOB sip_files_analysis analysis/*.sip)
79
- set (SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis} )
79
+ SET (SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis} )
80
80
ADD_SIP_PYTHON_MODULE(qgis.analysis analysis/analysis.sip qgis_core qgis_analysis)
81
81
82
82
Original file line number Diff line number Diff line change 1
- SUBDIRS (plugin_installer mapserver_export fTools GdalTools osm)
1
+ ADD_SUBDIRECTORY (plugin_installer)
2
+ ADD_SUBDIRECTORY (mapserver_export)
3
+ ADD_SUBDIRECTORY (fTools)
4
+ ADD_SUBDIRECTORY (GdalTools)
5
+ ADD_SUBDIRECTORY (osm)
Original file line number Diff line number Diff line change @@ -10,5 +10,5 @@ SET(INSTALLER_FILES ${INSTALLER_FILES} ${PYUI_FILES} ${PYRC_FILES})
10
10
11
11
INSTALL (FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR} /python/plugins/GdalTools)
12
12
13
- SUBDIRS (tools icons )
14
-
13
+ ADD_SUBDIRECTORY (tools)
14
+ ADD_SUBDIRECTORY (icons)
Original file line number Diff line number Diff line change @@ -10,5 +10,6 @@ SET(INSTALLER_FILES ${INSTALLER_FILES} ${PYUI_FILES} ${PYRC_FILES})
10
10
11
11
INSTALL (FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR} /python/plugins/fTools)
12
12
13
- SUBDIRS (tools icons)
13
+ ADD_SUBDIRECTORY (tools)
14
+ ADD_SUBDIRECTORY (icons)
14
15
Original file line number Diff line number Diff line change @@ -7,4 +7,5 @@ menu_icons.svg
7
7
)
8
8
INSTALL (FILES ${VECTOR_GRAPHICS_FILES} logo_small.png DESTINATION ${QGIS_DATA_DIR} /python/plugins/fTools/icons)
9
9
10
- SUBDIRS (default gis)
10
+ ADD_SUBDIRECTORY (default)
11
+ ADD_SUBDIRECTORY (gis)
Original file line number Diff line number Diff line change 1
-
2
1
INSTALL (FILES srs.db qgis.db qgis_help.db symbology-ng-style.xml spatialite.db customization.xml
3
2
DESTINATION ${QGIS_DATA_DIR} /resources)
4
3
5
- SUBDIRS (context_help)
4
+ ADD_SUBDIRECTORY (context_help)
Original file line number Diff line number Diff line change 1
- SUBDIRS (core analysis ui gui app providers plugins helpviewer crssync browser)
1
+ ADD_SUBDIRECTORY (core)
2
+ ADD_SUBDIRECTORY (analysis)
3
+ ADD_SUBDIRECTORY (ui)
4
+ ADD_SUBDIRECTORY (gui)
5
+ ADD_SUBDIRECTORY (app)
6
+ ADD_SUBDIRECTORY (providers)
7
+ ADD_SUBDIRECTORY (plugins)
8
+ ADD_SUBDIRECTORY (helpviewer)
9
+ ADD_SUBDIRECTORY (crssync)
10
+ ADD_SUBDIRECTORY (browser)
2
11
3
12
IF (WITH_BINDINGS)
4
- SUBDIRS (python)
13
+ ADD_SUBDIRECTORY (python)
5
14
ENDIF (WITH_BINDINGS)
6
15
7
16
IF (WITH_MAPSERVER)
8
- SUBDIRS (mapserver)
17
+ ADD_SUBDIRECTORY (mapserver)
9
18
ENDIF (WITH_MAPSERVER)
10
19
11
20
IF (WITH_ASTYLE)
12
- SUBDIRS (astyle)
21
+ ADD_SUBDIRECTORY (astyle)
13
22
ENDIF (WITH_ASTYLE)
14
23
15
24
IF (APPLE )
16
- SUBDIRS (mac)
25
+ ADD_SUBDIRECTORY (mac)
17
26
ENDIF (APPLE )
18
27
Original file line number Diff line number Diff line change 1
-
2
- SUBDIRS (Contents)
1
+ ADD_SUBDIRECTORY (Contents)
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ ADD_CUSTOM_TARGET(Info.plist ALL
21
21
#############################################################
22
22
# process subdirs
23
23
24
- SUBDIRS (Resources)
24
+ ADD_SUBDIRECTORY (Resources)
25
25
26
26
#############################################################
27
27
# install
Original file line number Diff line number Diff line change 1
- SUBDIRS (copyright_label
2
- delimited_text
3
- diagram_overlay
4
- interpolation
5
- north_arrow
6
- scale_bar
7
- oracle_raster
8
- raster_terrain_analysis
9
- coordinate_capture
10
- dxf2shp_converter
11
- evis
12
- point_displacement_renderer
13
- spatialquery
14
- sqlanywhere
15
- roadgraph
16
- )
1
+ ADD_SUBDIRECTORY (copyright_label)
2
+ ADD_SUBDIRECTORY (delimited_text)
3
+ ADD_SUBDIRECTORY (diagram_overlay)
4
+ ADD_SUBDIRECTORY (interpolation)
5
+ ADD_SUBDIRECTORY (north_arrow)
6
+ ADD_SUBDIRECTORY (scale_bar)
7
+ ADD_SUBDIRECTORY (oracle_raster)
8
+ ADD_SUBDIRECTORY (raster_terrain_analysis)
9
+ ADD_SUBDIRECTORY (coordinate_capture)
10
+ ADD_SUBDIRECTORY (dxf2shp_converter)
11
+ ADD_SUBDIRECTORY (evis)
12
+ ADD_SUBDIRECTORY (point_displacement_renderer)
13
+ ADD_SUBDIRECTORY (spatialquery)
14
+ ADD_SUBDIRECTORY (sqlanywhere)
15
+ ADD_SUBDIRECTORY (roadgraph)
17
16
18
17
IF (WITH_SPATIALITE)
19
- SUBDIRS ( offline_editing )
18
+ ADD_SUBDIRECTORY ( offline_editing)
20
19
ENDIF (WITH_SPATIALITE)
21
20
22
21
IF (POSTGRES_FOUND)
23
- SUBDIRS (spit)
22
+ ADD_SUBDIRECTORY (spit)
24
23
ENDIF (POSTGRES_FOUND)
25
24
26
25
IF (EXPAT_FOUND)
27
- SUBDIRS (gps_importer wfs)
26
+ ADD_SUBDIRECTORY (gps_importer)
27
+ ADD_SUBDIRECTORY (wfs)
28
28
ENDIF (EXPAT_FOUND)
29
29
30
30
IF (GSL_FOUND)
31
- SUBDIRS (georeferencer)
31
+ ADD_SUBDIRECTORY (georeferencer)
32
32
ENDIF (GSL_FOUND)
33
33
34
34
IF (GRASS_FOUND)
35
- SUBDIRS (grass)
35
+ ADD_SUBDIRECTORY (grass)
36
36
ENDIF (GRASS_FOUND)
37
37
38
38
INSTALL (FILES qgisplugin.h qgsrendererplugin.h DESTINATION ${QGIS_INCLUDE_DIR} )
39
-
Original file line number Diff line number Diff line change @@ -11,7 +11,10 @@ IF (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}")
11
11
MESSAGE (SEND_ERROR "Your GRASS version is not supported (${CMAKE_CURRENT_SOURCE_DIR} /${GRASS_MODULES_DIR} is not a Directory)." )
12
12
ENDIF (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR} /${GRASS_MODULES_DIR} " )
13
13
14
- SUBDIRS (modules-common ${GRASS_MODULES_DIR} scripts themes)
14
+ ADD_SUBDIRECTORY (modules-common)
15
+ ADD_SUBDIRECTORY (${GRASS_MODULES_DIR} )
16
+ ADD_SUBDIRECTORY (scripts)
17
+ ADD_SUBDIRECTORY (themes)
15
18
16
19
ADD_DEFINITIONS (-DGRASS_BASE=\\\"${GRASS_PREFIX} \\\")
17
20
ADD_DEFINITIONS (-DHAVE_OPENPTY=${HAVE_OPENPTY} )
Original file line number Diff line number Diff line change 1
- SUBDIRS (default classic gis)
1
+ ADD_SUBDIRECTORY (default)
2
+ ADD_SUBDIRECTORY (classic)
3
+ ADD_SUBDIRECTORY (gis)
Original file line number Diff line number Diff line change 1
-
2
- SUBDIRS (memory ogr wms delimitedtext osm sqlanywhere gdal)
1
+ ADD_SUBDIRECTORY (memory)
2
+ ADD_SUBDIRECTORY (ogr)
3
+ ADD_SUBDIRECTORY (wms)
4
+ ADD_SUBDIRECTORY (delimitedtext)
5
+ ADD_SUBDIRECTORY (osm)
6
+ ADD_SUBDIRECTORY (sqlanywhere)
7
+ ADD_SUBDIRECTORY (gdal)
3
8
4
9
IF (POSTGRES_FOUND)
5
- SUBDIRS (postgres)
10
+ ADD_SUBDIRECTORY (postgres)
6
11
ENDIF (POSTGRES_FOUND)
7
12
8
13
IF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
9
- SUBDIRS (spatialite)
14
+ ADD_SUBDIRECTORY (spatialite)
10
15
ENDIF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
11
16
12
17
IF (EXPAT_FOUND)
13
- SUBDIRS (gpx wfs)
18
+ ADD_SUBDIRECTORY (gpx)
19
+ ADD_SUBDIRECTORY (wfs)
14
20
ENDIF (EXPAT_FOUND)
15
21
16
22
IF (GRASS_FOUND)
17
- SUBDIRS (grass)
23
+ ADD_SUBDIRECTORY (grass)
18
24
ENDIF (GRASS_FOUND)
Original file line number Diff line number Diff line change 1
1
########################################################
2
2
# Files
3
3
4
- SUBDIRS ( sqlanyconnection )
4
+ ADD_SUBDIRECTORY ( sqlanyconnection)
5
5
6
6
SET (SA_SRCS qgssqlanywhereprovider.cpp)
7
7
SET (SA_MOC_HDRS qgssqlanywhereprovider.h)
Original file line number Diff line number Diff line change 1
- IF (ENABLE_TESTS)
2
- SUBDIRS (src)
3
- ENDIF (ENABLE_TESTS)
1
+ IF (ENABLE_TESTS)
2
+ ADD_SUBDIRECTORY (src)
3
+ ENDIF (ENABLE_TESTS)
Original file line number Diff line number Diff line change 1
1
IF (ENABLE_TESTS)
2
- SUBDIRS (core)
3
- SUBDIRS (gui)
4
- SUBDIRS (analysis)
2
+ ADD_SUBDIRECTORY (core)
3
+ ADD_SUBDIRECTORY (gui)
4
+ ADD_SUBDIRECTORY (analysis)
5
5
ENDIF (ENABLE_TESTS)
You can’t perform that action at this time.
0 commit comments