Skip to content

Commit b74a515

Browse files
jef-njef-n
committed
cmake: replace deprecated SUBDIRS with ADD_SUBDIRECTORY
1 parent bf4d887 commit b74a515

20 files changed

+107
-76
lines changed

‎CMakeLists.txt

+8-4
Original file line numberDiff line numberDiff line change
@@ -467,23 +467,27 @@ ADD_CUSTOM_TARGET(version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h)
467467
#############################################################
468468
# process subdirs
469469

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)
471475

472476
IF (WITH_BINDINGS)
473-
SUBDIRS (python)
477+
ADD_SUBDIRECTORY(python)
474478
ENDIF (WITH_BINDINGS)
475479

476480
IF (ENABLE_TESTS)
477481
#create a variable to specify where our test data is
478482
#so that unit tests can use TEST_DATA_DIR to locate
479483
#the test data. See CMakeLists in test dirs for more info
480484
SET (TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata")
481-
SUBDIRS(tests)
485+
ADD_SUBDIRECTORY(tests)
482486
ENDIF (ENABLE_TESTS)
483487

484488
IF (APPLE)
485489
# must be last for install, so install_name_tool can do its work
486-
SUBDIRS (mac)
490+
ADD_SUBDIRECTORY(mac)
487491
ENDIF (APPLE)
488492

489493
# manual page - makes sense only on unix systems

‎images/CMakeLists.txt

+17-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
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)

‎images/themes/gis/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SUBDIRS (plugins)
1+
ADD_SUBDIRECTORY(plugins)
22

33
FILE (GLOB IMAGES *.png)
44

‎images/themes/gis/plugins/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SUBDIRS (coordinate_capture)
1+
ADD_SUBDIRECTORY(coordinate_capture)
22

33
FILE (GLOB IMAGES *.png)
44

‎python/CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
SUBDIRS(plugins)
1+
ADD_SUBDIRECTORY(plugins)
22

33
IF (WITH_INTERNAL_SPATIALITE)
4-
SUBDIRS(pyspatialite)
4+
ADD_SUBDIRECTORY(pyspatialite)
55

66
INCLUDE_DIRECTORIES(
77
../src/core/spatialite/headers
@@ -51,7 +51,7 @@ ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
5151

5252
# core module
5353
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})
5555
ADD_SIP_PYTHON_MODULE(qgis.core core/core.sip qgis_core)
5656

5757
# additional gui includes
@@ -65,7 +65,7 @@ INCLUDE_DIRECTORIES(
6565

6666
# gui module
6767
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})
6969
ADD_SIP_PYTHON_MODULE(qgis.gui gui/gui.sip qgis_core qgis_gui)
7070

7171
# additional analysis includes
@@ -76,7 +76,7 @@ INCLUDE_DIRECTORIES(
7676

7777
# analysis module
7878
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})
8080
ADD_SIP_PYTHON_MODULE(qgis.analysis analysis/analysis.sip qgis_core qgis_analysis)
8181

8282

‎python/plugins/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
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)

‎python/plugins/GdalTools/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ SET(INSTALLER_FILES ${INSTALLER_FILES} ${PYUI_FILES} ${PYRC_FILES})
1010

1111
INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/GdalTools)
1212

13-
SUBDIRS(tools icons)
14-
13+
ADD_SUBDIRECTORY(tools)
14+
ADD_SUBDIRECTORY(icons)

‎python/plugins/fTools/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ SET(INSTALLER_FILES ${INSTALLER_FILES} ${PYUI_FILES} ${PYRC_FILES})
1010

1111
INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/fTools)
1212

13-
SUBDIRS(tools icons)
13+
ADD_SUBDIRECTORY(tools)
14+
ADD_SUBDIRECTORY(icons)
1415

‎python/plugins/fTools/icons/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ menu_icons.svg
77
)
88
INSTALL(FILES ${VECTOR_GRAPHICS_FILES} logo_small.png DESTINATION ${QGIS_DATA_DIR}/python/plugins/fTools/icons)
99

10-
SUBDIRS(default gis)
10+
ADD_SUBDIRECTORY(default)
11+
ADD_SUBDIRECTORY(gis)

‎resources/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
21
INSTALL(FILES srs.db qgis.db qgis_help.db symbology-ng-style.xml spatialite.db customization.xml
32
DESTINATION ${QGIS_DATA_DIR}/resources)
43

5-
SUBDIRS(context_help)
4+
ADD_SUBDIRECTORY(context_help)

‎src/CMakeLists.txt

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
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)
211

312
IF (WITH_BINDINGS)
4-
SUBDIRS(python)
13+
ADD_SUBDIRECTORY(python)
514
ENDIF (WITH_BINDINGS)
615

716
IF (WITH_MAPSERVER)
8-
SUBDIRS(mapserver)
17+
ADD_SUBDIRECTORY(mapserver)
918
ENDIF (WITH_MAPSERVER)
1019

1120
IF (WITH_ASTYLE)
12-
SUBDIRS(astyle)
21+
ADD_SUBDIRECTORY(astyle)
1322
ENDIF(WITH_ASTYLE)
1423

1524
IF (APPLE)
16-
SUBDIRS(mac)
25+
ADD_SUBDIRECTORY(mac)
1726
ENDIF(APPLE)
1827

‎src/mac/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
2-
SUBDIRS(Contents)
1+
ADD_SUBDIRECTORY(Contents)

‎src/mac/Contents/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ADD_CUSTOM_TARGET(Info.plist ALL
2121
#############################################################
2222
# process subdirs
2323

24-
SUBDIRS(Resources)
24+
ADD_SUBDIRECTORY(Resources)
2525

2626
#############################################################
2727
# install

‎src/plugins/CMakeLists.txt

+21-22
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,38 @@
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)
1716

1817
IF (WITH_SPATIALITE)
19-
SUBDIRS( offline_editing )
18+
ADD_SUBDIRECTORY(offline_editing)
2019
ENDIF (WITH_SPATIALITE)
2120

2221
IF (POSTGRES_FOUND)
23-
SUBDIRS (spit)
22+
ADD_SUBDIRECTORY(spit)
2423
ENDIF (POSTGRES_FOUND)
2524

2625
IF (EXPAT_FOUND)
27-
SUBDIRS (gps_importer wfs)
26+
ADD_SUBDIRECTORY(gps_importer)
27+
ADD_SUBDIRECTORY(wfs)
2828
ENDIF (EXPAT_FOUND)
2929

3030
IF (GSL_FOUND)
31-
SUBDIRS (georeferencer)
31+
ADD_SUBDIRECTORY(georeferencer)
3232
ENDIF (GSL_FOUND)
3333

3434
IF (GRASS_FOUND)
35-
SUBDIRS (grass)
35+
ADD_SUBDIRECTORY(grass)
3636
ENDIF (GRASS_FOUND)
3737

3838
INSTALL(FILES qgisplugin.h qgsrendererplugin.h DESTINATION ${QGIS_INCLUDE_DIR})
39-

‎src/plugins/grass/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ IF (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}")
1111
MESSAGE (SEND_ERROR "Your GRASS version is not supported (${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR} is not a Directory).")
1212
ENDIF (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}")
1313

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)
1518

1619
ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
1720
ADD_DEFINITIONS(-DHAVE_OPENPTY=${HAVE_OPENPTY})

‎src/plugins/grass/themes/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
SUBDIRS(default classic gis)
1+
ADD_SUBDIRECTORY(default)
2+
ADD_SUBDIRECTORY(classic)
3+
ADD_SUBDIRECTORY(gis)

‎src/providers/CMakeLists.txt

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
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)
38

49
IF (POSTGRES_FOUND)
5-
SUBDIRS (postgres)
10+
ADD_SUBDIRECTORY(postgres)
611
ENDIF (POSTGRES_FOUND)
712

813
IF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
9-
SUBDIRS (spatialite)
14+
ADD_SUBDIRECTORY(spatialite)
1015
ENDIF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
1116

1217
IF (EXPAT_FOUND)
13-
SUBDIRS (gpx wfs)
18+
ADD_SUBDIRECTORY(gpx)
19+
ADD_SUBDIRECTORY(wfs)
1420
ENDIF (EXPAT_FOUND)
1521

1622
IF (GRASS_FOUND)
17-
SUBDIRS (grass)
23+
ADD_SUBDIRECTORY(grass)
1824
ENDIF (GRASS_FOUND)

‎src/providers/sqlanywhere/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
########################################################
22
# Files
33

4-
SUBDIRS( sqlanyconnection )
4+
ADD_SUBDIRECTORY(sqlanyconnection)
55

66
SET (SA_SRCS qgssqlanywhereprovider.cpp)
77
SET (SA_MOC_HDRS qgssqlanywhereprovider.h)

‎tests/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
IF (ENABLE_TESTS)
2-
SUBDIRS(src)
3-
ENDIF (ENABLE_TESTS)
1+
IF (ENABLE_TESTS)
2+
ADD_SUBDIRECTORY(src)
3+
ENDIF (ENABLE_TESTS)

‎tests/src/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
IF (ENABLE_TESTS)
2-
SUBDIRS(core)
3-
SUBDIRS(gui)
4-
SUBDIRS(analysis)
2+
ADD_SUBDIRECTORY(core)
3+
ADD_SUBDIRECTORY(gui)
4+
ADD_SUBDIRECTORY(analysis)
55
ENDIF (ENABLE_TESTS)

0 commit comments

Comments
 (0)