Replace deprecated SUBDIRS by ADD_SUBDIRECTORY

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f42bb54c94701526268423ddd071a6e6b410df5..b5f2e688e88a803e5ef90aebee908c5d43d73b77 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,9 +57,12 @@ CREA_PREVENT_IN_SOURCE_BUILD()
 #  if you need to LINK against crea
 #  (and not only use its macros)
 SET(USE_CREA      ON)
-OPTION(USE_GDCM   "Use GDCM"   ON)
+#
+# ----------------- manual setting GDCM/GDCM2 JPR
+#
+OPTION(USE_GDCM   "Use GDCM"   OFF)
 SET(USE_GDCM_VTK  ON)
-OPTION(USE_GDCM2  "Use gdcm 2.0.14 at least"   OFF)
+OPTION(USE_GDCM2  "Use gdcm 2.0.14 at least"   ON)
 # No interface for the moment, don't allow to add useless libraries
 SET(USE_WXWIDGETS OFF CACHE BOOL "Use wxWidgets" FORCE)
 SET(USE_KWWIDGETS OFF)
@@ -121,9 +124,9 @@ SET(BBTK_DOC_BUILD_PATH
 #==================================
 
 # Subdirs
-SUBDIRS(lib)
-SUBDIRS(appli)
-SUBDIRS(doc)
-SUBDIRS(install)
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(doc)
+ADD_SUBDIRECTORY(install)
 
 #==================================

diff --git a/appli/CMakeLists.txt b/appli/CMakeLists.txt
index da8303bfa282e96a345cf1f81df219dcc507a215..31c6a7c6bbb3f2d1a6a1da1009ed730c4cd7a244 100644 (file)
--- a/appli/CMakeLists.txt
+++ b/appli/CMakeLists.txt
@@ -1,8 +1,8 @@
-# Add a SUBDIRS command for each one of your applications
-# SUBDIRS(MyApp1)
-# SUBDIRS(MyApp2)
+# Add a ADD_SUBDIRECTORY command for each one of your applications
+# ADD_SUBDIRECTORY(MyApp1)
+# ADD_SUBDIRECTORY(MyApp2)
 if(USE_GDCM)
-SUBDIRS(
+ADD_SUBDIRECTORY(
 # ==> mettez ici la liste des directories qui contiennent 
 # ==> les fichiers sources de chacune de vos applications
 # ==> Selon que l'application utilise ou non wX, vous duppliquerez

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 2f9447ea5898557344e63cf5fcd95c48f1fc44dc..7becfcfd811fefa746e79306972af1ee99ff71f3 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -3,7 +3,7 @@
 #-----------------------------------------------------------------------------
 IF(BUILD_${PROJECT_NAME}_DOC AND BUILD_${PROJECT_NAME}_DOC_DOXYGEN)
   INCLUDE(../cmake/UserBuildDoxygenDoc.cmake)
-  SUBDIRS(UserDoxygen)
+  ADD_SUBDIRECTORY(UserDoxygen)
 ENDIF(BUILD_${PROJECT_NAME}_DOC AND BUILD_${PROJECT_NAME}_DOC_DOXYGEN)
 #-----------------------------------------------------------------------------
 
@@ -29,7 +29,7 @@ ENDIF(BUILD_${PROJECT_NAME}_DOC AND BUILD_${PROJECT_NAME}_DOC_GUIDES_HTML)
 
 #-----------------------------------------------------------------------------
 IF(BUILD_${PROJECT_NAME}_DOC AND BUILD_${PROJECT_NAME}_DOC_GUIDES_PDF OR BUILD_${PROJECT_NAME}_DOC_GUIDES_HTML)  
-  SUBDIRS(UserDocumentation)  
+  ADD_SUBDIRECTORY(UserDocumentation)  
 ENDIF(BUILD_${PROJECT_NAME}_DOC AND BUILD_${PROJECT_NAME}_DOC_GUIDES_PDF OR BUILD_${PROJECT_NAME}_DOC_GUIDES_HTML)
 #-----------------------------------------------------------------------------
 # Web site 
@@ -69,7 +69,7 @@ IF(BUILD_${PROJECT_NAME}_DOC)
     ) 
 
   # Recurse it bbtkWebSite dir
-  SUBDIRS(template_WebSite)
+  ADD_SUBDIRECTORY(template_WebSite)
 
 
 

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e04cd35a592a5d9a90528f1693aed0fc2485444d..e641fe14be4f7a8031b6192a80bd991c7d822a29 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
-# Add a SUBDIRS command for each one of your libraries
- SUBDIRS(src1)
+# Add a ADD_SUBDIRECTORY command for each one of your libraries
+ ADD_SUBDIRECTORY(src1)

diff --git a/lib/src1/CMakeLists.txt b/lib/src1/CMakeLists.txt
index 6cc702baf977541394889fb21f478000c29127d3..7270c18b3be0e07c30368e7cc91df760b540c152 100644 (file)
--- a/lib/src1/CMakeLists.txt
+++ b/lib/src1/CMakeLists.txt
@@ -78,7 +78,7 @@ endif()
 )
   OPTION( BUILD_DOXYGEN_DOC "Build doxygen doc ?" OFF)
 IF(BUILD_DOXYGEN_DOC)
-  SUBDIRS(doxygen)
+  ADD_SUBDIRECTORY(doxygen)
 ENDIF(BUILD_DOXYGEN_DOC)