]> Creatis software - bbtk.git/commitdiff
change SUBDIRS (deprecate functionality) to ADD_SUBDIRECTORY
authorFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Wed, 10 Nov 2010 16:01:12 +0000 (16:01 +0000)
committerFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Wed, 10 Nov 2010 16:01:12 +0000 (16:01 +0000)
doc/cmake-relations.txt
kernel/cmake/BBTKConfigurePackage_doc.cmake
kernel/doc/bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.tex
packages/itk/CMakeLists.txt

index 394a15f..00a2fc8 100644 (file)
@@ -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
index 824ecf0..6f61c38 100644 (file)
@@ -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)
 #---------------------------------------------------------------------------
index eaf06da..dceb24e 100644 (file)
@@ -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  
index 6c35eee..72aff18 100644 (file)
@@ -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