change SUBDIRS (deprecate functionality) to ADD_SUBDIRECTORY

diff --git a/doc/cmake-relations.txt b/doc/cmake-relations.txt
index 394a15f0187788510dcc95ed258b271d7fc19040..00a2fc80e59fcbb47452e2f264f1e0d1246c5bb2 100644 (file)
--- a/doc/cmake-relations.txt
+++ b/doc/cmake-relations.txt
@@ -30,11 +30,11 @@ BBTK-CMakeList.txt
        INCLUDE(${BBTK_CMAKE_DIR}/BBTKMarkAsAdvanced.cmake)
        INCLUDE(${BBTK_CMAKE_DIR}/BBTKDefineOptions.cmake)
        INCLUDE(${BBTK_CMAKE_DIR}/BBTKAddDefinitions.cmake)
-   SUBDIRS(kernel)
-       SUBDIRS(src)
-       SUBDIRS(doc)
-       SUBDIRS(appli)
-       SUBDIRS(cmake)
-       SUBDIRS(install)
-       SUBDIRS(data)
-   SUBDIRS(packages)
\ No newline at end of file
+   ADD_SUBDIRECTORY(kernel)
+       ADD_SUBDIRECTORY(src)
+       ADD_SUBDIRECTORY(doc)
+       ADD_SUBDIRECTORY(appli)
+       ADD_SUBDIRECTORY(cmake)
+       ADD_SUBDIRECTORY(install)
+       ADD_SUBDIRECTORY(data)
+   ADD_SUBDIRECTORY(packages)
\ No newline at end of file

diff --git a/kernel/cmake/BBTKConfigurePackage_doc.cmake b/kernel/cmake/BBTKConfigurePackage_doc.cmake
index 824ecf00975de924b810299808add735572363b6..6f61c380523982579bbaca61059cfc26c03243a6 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_doc.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_doc.cmake
@@ -31,7 +31,7 @@ ENDIF(BBTK_CORE_PACKAGE)
 #----------------------------------------------------------------------------
 IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC)
   SET(${BBTK_PACKAGE_NAME}_DOXYGEN_REL_PATH ${BBTK_PACKAGE_NAME})
-  SUBDIRS(doxygen)
+  ADD_SUBDIRECTORY(doxygen)
 ENDIF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC)
 #----------------------------------------------------------------------------
 
@@ -41,6 +41,6 @@ ENDIF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC)
 # bbdoc
 #---------------------------------------------------------------------------
 #IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
-  SUBDIRS(bbdoc)
+  ADD_SUBDIRECTORY(bbdoc)
 #ENDIF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
 #---------------------------------------------------------------------------

diff --git a/kernel/doc/bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.tex b/kernel/doc/bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.tex
index eaf06dafd308fbbca7e9a061d8146692507b29cb..dceb24e62efd74c1893d371890644eeb8682eb54 100644 (file)
--- a/kernel/doc/bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.tex
+++ b/kernel/doc/bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.tex
@@ -83,7 +83,7 @@ a processing code (\CPP classes or \C functions), which
 is in an existing project handled by \cmake
 and you want the new package to be part of your existing project. 
 You will have to create your new package within the source tree of your 
-project and add a \texttt{SUBDIRS} command in the \texttt{CMakeLists.txt} 
+project and add a \texttt{ADD_SUBDIRECTORY} command in the \texttt{CMakeLists.txt} 
 file of the parent directory of your package.
 \item You do not have an already existing project (you want 
 to create the new boxes from scratch) or you want/are imposed  

diff --git a/packages/itk/CMakeLists.txt b/packages/itk/CMakeLists.txt
index 6c35eee9a2cb322037f859aa49f82827068deee1..72aff186c80855e509b877d41a634b4e7df5c814 100644 (file)
--- a/packages/itk/CMakeLists.txt
+++ b/packages/itk/CMakeLists.txt
@@ -123,8 +123,10 @@ SET(${BBTK_PACKAGE_NAME}_LIBS
   # LIST HERE THE LIBS TO LINK AGAINST (EXCEPT BBTK)
   )
 #===========================================================================
-
-
+# To compile with VS under x64, /bigobj flag is needed
+IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+       set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
+ENDIF()
 
 #===========================================================================
 # END OF USER SECTION