From f2ea017626fea02b78911776a5f6c6a5e240a816 Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Wed, 18 Aug 2010 12:36:31 +0000 Subject: [PATCH] change subdirs to add_subdirectory --- CMakeLists.txt | 6 ++--- kernel/CMakeLists.txt | 14 +++++----- kernel/appli/CMakeLists.txt | 30 ++++++++++----------- kernel/appli/bbCreatePackage/CMakeLists.txt | 2 +- kernel/data/CMakeLists.txt | 2 +- kernel/doc/CMakeLists.txt | 10 +++---- kernel/install/CMakeLists.txt | 6 ++--- kernel/install/linux/CMakeLists.txt | 2 +- kernel/src/CMakeLists.txt | 4 +-- kernel/src/EditorGraphicBBS/CMakeLists.txt | 6 ++--- packages/CMakeLists.txt | 24 ++++++++--------- packages/vtk/src/bbvtkImagePlanes.cxx | 12 +++++---- samples/CMakeLists.txt | 8 +++--- 13 files changed, 64 insertions(+), 62 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7889c1..a2f62b2 100644 --- 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 3068544..c6f9aad 100644 --- 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 42f1929..dc182fd 100644 --- 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 19691de..63e689e 100644 --- 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 4ec4a58..615ea90 100644 --- 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 9ccdebd..5124ca1 100755 --- 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 880bb0f..2eef5a7 100644 --- 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 8fb0b47..d197556 100644 --- 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 8cd4249..a88d416 100644 --- 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 c29617b..6c29963 100644 --- 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 211a1f8..dfc41b8 100644 --- 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 d837a49..c31a38d 100644 --- 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 f1f9920..f7d270f 100644 --- 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) -- 2.45.1