change subdirs to add_subdirectory

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7889c1852fc6d5a5f9658ad2f3389a0f0e7ed06..a2f62b2886390435de935586b46b5bb3fb8e95f9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,19 +13,19 @@ INCLUDE(kernel/cmake/BBTKRootCMakeLists.cmake NO_POLICY_SCOPE )
 
 #-----------------------------------------------------------------------------
 # The toolkit kernel (bbtk lib; appli : bbi, bbfy; docs; ...)
-SUBDIRS(kernel)
+ADD_SUBDIRECTORY(kernel)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # The "core" packages 
-SUBDIRS(packages)
+ADD_SUBDIRECTORY(packages)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # The samples
 #OPTION(BUILD_BBTK_SAMPLES "Build bbtk samples" OFF)
 #IF(BUILD_BBTK_SAMPLES)
-#  SUBDIRS(samples)
+#  ADD_SUBDIRECTORY(samples)
 #ENDIF(BUILD_BBTK_SAMPLES)
 #-----------------------------------------------------------------------------
 

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 30685445848c36df8a20e4b24f04bfc055ec47f6..c6f9aad3e8d5fbec96aa53c503dc0dcf8f4cbb55 100644 (file)
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -1,33 +1,33 @@
 
 #-----------------------------------------------------------------------------
 # bbtk library 
-SUBDIRS(src)
+ADD_SUBDIRECTORY(src)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Documentation
-SUBDIRS(doc)
+ADD_SUBDIRECTORY(doc)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Applications (bbi, bbfy...)
 IF(BUILD_APPLICATIONS)
-   SUBDIRS(appli)
+   ADD_SUBDIRECTORY(appli)
 ENDIF(BUILD_APPLICATIONS)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Recurse into cmake folder to install files
-SUBDIRS(cmake)
+ADD_SUBDIRECTORY(cmake)
 #-----------------------------------------------------------------------------
 
 
 #-----------------------------------------------------------------------------
 # System-specific installation tools
-SUBDIRS(install)
+ADD_SUBDIRECTORY(install)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-SUBDIRS(data)
+ADD_SUBDIRECTORY(data)
 #-----------------------------------------------------------------------------
-SUBDIRS(bin)
\ No newline at end of file
+ADD_SUBDIRECTORY(bin)
\ No newline at end of file

diff --git a/kernel/appli/CMakeLists.txt b/kernel/appli/CMakeLists.txt
index 42f19296ae62660b5c273d40a10512ffba5c2cb7..dc182fd9318b9d58bddf0410ff68eeb445bf786a 100644 (file)
--- a/kernel/appli/CMakeLists.txt
+++ b/kernel/appli/CMakeLists.txt
@@ -1,45 +1,45 @@
 
 IF(WIN32)
 # Replace strings in a file (sed for windows)
-SUBDIRS(bbSed)
+ADD_SUBDIRECTORY(bbSed)
 ENDIF(WIN32)
 
 # The BlackBox Interpreter
-SUBDIRS(bbi)
+ADD_SUBDIRECTORY(bbi)
 # LG test
-#SUBDIRS(bbI)
+#ADD_SUBDIRECTORY(bbI)
 
 # Black box code generator from xml
-SUBDIRS(bbfy)
+ADD_SUBDIRECTORY(bbfy)
 
 # Creates html documentation of a package
-#SUBDIRS(bbdoc)
+#ADD_SUBDIRECTORY(bbdoc)
 
 
 # Utility that creates the file architecture for a new user package 
-SUBDIRS(bbCreatePackage)
+ADD_SUBDIRECTORY(bbCreatePackage)
 
 
 # Utility that creates a new user black box 
-SUBDIRS(bbCreateBlackBox) 
+ADD_SUBDIRECTORY(bbCreateBlackBox) 
 
 # The black box script development studio
-SUBDIRS(bbStudio)
+ADD_SUBDIRECTORY(bbStudio)
 
 
 # The black box package browser
-SUBDIRS(bbPackageBrowser)
+ADD_SUBDIRECTORY(bbPackageBrowser)
 
 #
-SUBDIRS(bbs2cpp)
+ADD_SUBDIRECTORY(bbs2cpp)
 
-SUBDIRS(bbc)
+ADD_SUBDIRECTORY(bbc)
 
-SUBDIRS(bbRegenerateBoxesLists)
+ADD_SUBDIRECTORY(bbRegenerateBoxesLists)
 
-SUBDIRS(bbRegeneratePackageDoc)
+ADD_SUBDIRECTORY(bbRegeneratePackageDoc)
 
-SUBDIRS(bbPostInstallPackage)
+ADD_SUBDIRECTORY(bbPostInstallPackage)
 
-SUBDIRS(bbPlugPackage)
+ADD_SUBDIRECTORY(bbPlugPackage)
 

diff --git a/kernel/appli/bbCreatePackage/CMakeLists.txt b/kernel/appli/bbCreatePackage/CMakeLists.txt
index 19691de13a852615e929e886b4c4a6729b9c7bb8..63e689e5fb9568e3b571ca34e205749c773d282d 100644 (file)
--- a/kernel/appli/bbCreatePackage/CMakeLists.txt
+++ b/kernel/appli/bbCreatePackage/CMakeLists.txt
@@ -2,7 +2,7 @@
 # used to creates the file architecture for a new user package
 
 # go to data which install the input data to the script
-#SUBDIRS(data)
+#ADD_SUBDIRECTORY(data)
 
 # Sets the data install path
 

diff --git a/kernel/data/CMakeLists.txt b/kernel/data/CMakeLists.txt
index 4ec4a58ff2ceb97ffcfe128a8d0120b60e6a141e..615ea904bdfe4432964dc4a48ee7a9122406b5d4 100644 (file)
--- a/kernel/data/CMakeLists.txt
+++ b/kernel/data/CMakeLists.txt
@@ -1 +1 @@
-SUBDIRS(icons)
+ADD_SUBDIRECTORY(icons)

diff --git a/kernel/doc/CMakeLists.txt b/kernel/doc/CMakeLists.txt
index 9ccdebd4bc23f70eebf84fc18a4fefc2bca4aebd..5124ca17feb00ef49cb0ad439e0926c88f5d3502 100755 (executable)
--- a/kernel/doc/CMakeLists.txt
+++ b/kernel/doc/CMakeLists.txt
@@ -3,7 +3,7 @@
 #-----------------------------------------------------------------------------
 IF(BUILD_BBTK_DOC AND BUILD_BBTK_DOC_DOXYGEN)
   INCLUDE(../cmake/BBTKBuildDoxygenDoc.cmake)
-  SUBDIRS(bbtkDoxygen)
+  ADD_SUBDIRECTORY(bbtkDoxygen)
 ENDIF(BUILD_BBTK_DOC AND BUILD_BBTK_DOC_DOXYGEN)
 #-----------------------------------------------------------------------------
 
@@ -30,9 +30,9 @@ ENDIF(BUILD_BBTK_DOC AND BUILD_BBTK_DOC_GUIDES_HTML)
 
 #-----------------------------------------------------------------------------
 IF(BUILD_BBTK_DOC AND BUILD_BBTK_DOC_GUIDES_PDF OR BUILD_BBTK_DOC_GUIDES_HTML)
-  SUBDIRS(bbtkUsersGuide)
-  SUBDIRS(bbtkPackageDevelopersGuide)
-  SUBDIRS(bbtkDevelopersGuide)
+  ADD_SUBDIRECTORY(bbtkUsersGuide)
+  ADD_SUBDIRECTORY(bbtkPackageDevelopersGuide)
+  ADD_SUBDIRECTORY(bbtkDevelopersGuide)
 ENDIF(BUILD_BBTK_DOC AND BUILD_BBTK_DOC_GUIDES_PDF OR BUILD_BBTK_DOC_GUIDES_HTML)
 #-----------------------------------------------------------------------------
 
@@ -75,7 +75,7 @@ IF(BUILD_BBTK_DOC)
     ) 
 
   # Recurse it bbtkWebSite dir
-  SUBDIRS(bbtkWebSite)
+  ADD_SUBDIRECTORY(bbtkWebSite)
 
 
 

diff --git a/kernel/install/CMakeLists.txt b/kernel/install/CMakeLists.txt
index 880bb0f72f8085f2ddda96a7a686aeb5bf4f7cf9..2eef5a75e9808f8e79474ef217653db29ddcc6d5 100644 (file)
--- a/kernel/install/CMakeLists.txt
+++ b/kernel/install/CMakeLists.txt
@@ -1,9 +1,9 @@
 IF(UNIX)
-  SUBDIRS(linux)
-  SUBDIRS(gnome)
+  ADD_SUBDIRECTORY(linux)
+  ADD_SUBDIRECTORY(gnome)
 ENDIF(UNIX)
 
-SUBDIRS(cpack)
+ADD_SUBDIRECTORY(cpack)
 
 
 

diff --git a/kernel/install/linux/CMakeLists.txt b/kernel/install/linux/CMakeLists.txt
index 8fb0b475a705f35f472fdc4e4bcd75b37886132f..d19755670c056c30240bedd13d539edb093ae6e6 100644 (file)
--- a/kernel/install/linux/CMakeLists.txt
+++ b/kernel/install/linux/CMakeLists.txt
@@ -5,4 +5,4 @@ INSTALL(
 )
 
 # rpmbuild
-SUBDIRS(rpmbuild)
+ADD_SUBDIRECTORY(rpmbuild)

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 8cd424943a3e4f0a892d8c3491f8280fbfe8ee71..a88d416a53edb9b57929b02f9b202583758b24a5 100644 (file)
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -265,13 +265,13 @@ CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 
 #-----------------------------------------------------------------------------
 # Recurse in EditorGraphicBBS to build the needed libs
-SUBDIRS(EditorGraphicBBS)
+ADD_SUBDIRECTORY(EditorGraphicBBS)
 #-----------------------------------------------------------------------------
 
 
 #-----------------------------------------------------------------------------
 # Recurse in ThirdParty to build the needed libs
-#SUBDIRS(ThirdParty)
+#ADD_SUBDIRECTORY(ThirdParty)
 #-----------------------------------------------------------------------------
 
 

diff --git a/kernel/src/EditorGraphicBBS/CMakeLists.txt b/kernel/src/EditorGraphicBBS/CMakeLists.txt
index c29617bf7c103b470d5f633f06e53dcdd60c192c..6c29963b99895d224d8f0adee20291e39dddf1a4 100644 (file)
--- a/kernel/src/EditorGraphicBBS/CMakeLists.txt
+++ b/kernel/src/EditorGraphicBBS/CMakeLists.txt
@@ -1,5 +1,5 @@
-SUBDIRS(bbsKernelEditorGraphic)
-SUBDIRS(bbsVtkGUIEditorGraphic)
+ADD_SUBDIRECTORY(bbsKernelEditorGraphic)
+ADD_SUBDIRECTORY(bbsVtkGUIEditorGraphic)
 if(USE_WXWIDGETS)
-SUBDIRS(bbsWxGUIEditorGraphic)
+ADD_SUBDIRECTORY(bbsWxGUIEditorGraphic)
 endif()
\ No newline at end of file

diff --git a/packages/CMakeLists.txt b/packages/CMakeLists.txt
index 211a1f8364e471541ed6244895c498725f62b522..dfc41b8c916ed215c93bf6c0dfc8b1133bfa3a02 100644 (file)
--- a/packages/CMakeLists.txt
+++ b/packages/CMakeLists.txt
@@ -1,24 +1,24 @@
 
 #-----------------------------------------------------------------------------
-SUBDIRS(std)
-SUBDIRS(wx)
-SUBDIRS(itk)
-SUBDIRS(vtk)
-SUBDIRS(toolsbbtk)
-SUBDIRS(wxvtk)
-SUBDIRS(itkvtk)
-SUBDIRS(demo)
-SUBDIRS(appli)
+ADD_SUBDIRECTORY(std)
+ADD_SUBDIRECTORY(wx)
+ADD_SUBDIRECTORY(itk)
+ADD_SUBDIRECTORY(vtk)
+ADD_SUBDIRECTORY(toolsbbtk)
+ADD_SUBDIRECTORY(wxvtk)
+ADD_SUBDIRECTORY(itkvtk)
+ADD_SUBDIRECTORY(demo)
+ADD_SUBDIRECTORY(appli)
 
-SUBDIRS(gdcmvtk)
+ADD_SUBDIRECTORY(gdcmvtk)
 
 
 IF(BBTK_USE_KWWIDGETS)
-  SUBDIRS(kw)
+  ADD_SUBDIRECTORY(kw)
 ENDIF(BBTK_USE_KWWIDGETS)
 
 IF(BBTK_USE_QT)
-  SUBDIRS(qt)
+  ADD_SUBDIRECTORY(qt)
 ENDIF(BBTK_USE_QT)
 #-----------------------------------------------------------------------------
 

diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx
index d837a49ab4bd4f9eea9dab78d1d33714af69c7ca..c31a38d2583e85fdc3059f9b9f2a1ab97db0af54 100644 (file)
--- a/packages/vtk/src/bbvtkImagePlanes.cxx
+++ b/packages/vtk/src/bbvtkImagePlanes.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkImagePlanes.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/06/01 13:48:14 $
-  Version:   $Revision: 1.34 $
+  Date:      $Date: 2010/08/18 12:36:45 $
+  Version:   $Revision: 1.35 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -136,7 +136,7 @@ namespace bbvtk
  };
   //================================================================
 
-  //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.34 $");
+  //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.35 $");
 
   //================================================================
 
@@ -204,13 +204,15 @@ namespace bbvtk
      bbSetInputInteractor(0);
      //bbSetOutputImage3Pts(planeWidget3Pts->GetResliceOutput());
 
-     picker->UnRegister(NULL);
+        if(picker != 0)
+               picker->UnRegister(NULL);
      
      mVtkCallback = VtkCallbackType::New();
      mVtkCallback->SetBlackBox(this);
      planeWidgetX->AddObserver(vtkCommand::InteractionEvent,mVtkCallback);
      planeWidgetY->AddObserver(vtkCommand::InteractionEvent,mVtkCallback);
-     planeWidgetZ->AddObserver(vtkCommand::InteractionEvent,mVtkCallback);  
+     planeWidgetZ->AddObserver(vtkCommand::InteractionEvent,mVtkCallback);      
+
    }
 
 //---------------------------------------------------------------------

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index f1f9920d128d52f6bed9543bb89ac9353c5c8161..f7d270fc0f409e2ab58b95deb8667a39454986ba 100644 (file)
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -14,7 +14,7 @@ PROJECT(BBTK_SAMPLES)
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 
-SUBDIRS(SampleWidgetsBase)
-SUBDIRS(SampleOutputObserver)
-SUBDIRS(SampleInsertWxBlackBoxInOwnFrame)
-SUBDIRS(SampleInterpreter)
+ADD_SUBDIRECTORY(SampleWidgetsBase)
+ADD_SUBDIRECTORY(SampleOutputObserver)
+ADD_SUBDIRECTORY(SampleInsertWxBlackBoxInOwnFrame)
+ADD_SUBDIRECTORY(SampleInterpreter)