From 1b9af7b2c71aa44e2e5adebd2826f26b55d4b209 Mon Sep 17 00:00:00 2001
From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Wed, 10 Nov 2010 15:36:56 +0000
Subject: [PATCH] change SUBDIRS (deprecate functionality) to ADD_SUBDIRECTORY

---
 CMakeLists.txt                                            | 8 ++++----
 lib/CMakeLists.txt                                        | 6 +++---
 lib/maracasVisuLib/CMakeLists.txt                         | 2 +-
 lib/maracasVisuLib/src/CMakeLists.txt                     | 2 +-
 lib/maracasVisuLib/src/CMakeListsWorking.txt_CP           | 2 +-
 lib/maracasVisuLib/src/CutModule/CMakeLists.txt           | 4 ++--
 lib/maracasVisuLib/src/interface/CMakeLists.txt           | 2 +-
 lib/maracasVisuLib/src/interface/CMakeLists.txt_CP        | 2 +-
 lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt | 2 +-
 .../src/interface/wxWindows/widgets/vtkMPR3DDataViewer.h  | 7 +++++++
 .../src/interface/wxWindows/widgets/wxMPRBaseData.cxx     | 4 +++-
 .../src/interface/wxWindows/widgets/wxMPRBaseData.h       | 7 ++++++-
 .../src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx   | 4 +++-
 .../src/interface/wxWindows/widgets/wxVtk3DBaseView.h     | 7 ++++++-
 .../src/interface/wxWindows/widgets/wxVtkBaseView.h       | 1 +
 .../src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx    | 5 +++++
 16 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 858c157..afd1471 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,10 +46,10 @@ MARK_AS_ADVANCED(
 
 SET(CREAMARACASVISU_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
 
-SUBDIRS(install)
-#SUBDIRS(appli)
-SUBDIRS(lib)
-SUBDIRS(bbtk)
+ADD_SUBDIRECTORY(install)
+#ADD_SUBDIRECTORY(appli)
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(bbtk)
 
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/data/Icons )
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index d134e4a..a00aa43 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,3 +1,3 @@
-# Add a SUBDIRS command for each of your libraries
-SUBDIRS(maracasVisuLib)
-SUBDIRS(doxygen)
+# Add a ADD_SUBDIRECTORY command for each of your libraries
+ADD_SUBDIRECTORY(maracasVisuLib)
+ADD_SUBDIRECTORY(doxygen)
diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 47a9c24..9e220bd 100644
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -233,4 +233,4 @@ ENDIF(WIN32)
   #---------------------------------------------------------------------------
 ENDIF ( BUILD_${LIBRARY_NAME} )
 
-SUBDIRS(src)
+ADD_SUBDIRECTORY(src)
diff --git a/lib/maracasVisuLib/src/CMakeLists.txt b/lib/maracasVisuLib/src/CMakeLists.txt
index 1182ea5..fab3256 100644
--- a/lib/maracasVisuLib/src/CMakeLists.txt
+++ b/lib/maracasVisuLib/src/CMakeLists.txt
@@ -1,2 +1,2 @@
-SUBDIRS(CutModule)
+ADD_SUBDIRECTORY(CutModule)
 
diff --git a/lib/maracasVisuLib/src/CMakeListsWorking.txt_CP b/lib/maracasVisuLib/src/CMakeListsWorking.txt_CP
index 9e8488a..f097130 100644
--- a/lib/maracasVisuLib/src/CMakeListsWorking.txt_CP
+++ b/lib/maracasVisuLib/src/CMakeListsWorking.txt_CP
@@ -1,4 +1,4 @@
-SUBDIRS(
+ADD_SUBDIRECTORY(
 SnakeIsoContour+Deriche
 kernel
 interface
diff --git a/lib/maracasVisuLib/src/CutModule/CMakeLists.txt b/lib/maracasVisuLib/src/CutModule/CMakeLists.txt
index a52a32a..2fd579c 100644
--- a/lib/maracasVisuLib/src/CutModule/CMakeLists.txt
+++ b/lib/maracasVisuLib/src/CutModule/CMakeLists.txt
@@ -20,7 +20,7 @@ IF ( BUILD_${LIBRARY_NAME} )#---------------------------------------------------
     interface
     kernel	
 )    
-  SUBDIRS(interface)
-  SUBDIRS(kernel)
+  ADD_SUBDIRECTORY(interface)
+  ADD_SUBDIRECTORY(kernel)
 ENDIF ( BUILD_${LIBRARY_NAME} )
 
diff --git a/lib/maracasVisuLib/src/interface/CMakeLists.txt b/lib/maracasVisuLib/src/interface/CMakeLists.txt
index be0a96d..fe5cdb6 100644
--- a/lib/maracasVisuLib/src/interface/CMakeLists.txt
+++ b/lib/maracasVisuLib/src/interface/CMakeLists.txt
@@ -1 +1 @@
-SUBDIRS(wxWindows)
+ADD_SUBDIRECTORY(wxWindows)
diff --git a/lib/maracasVisuLib/src/interface/CMakeLists.txt_CP b/lib/maracasVisuLib/src/interface/CMakeLists.txt_CP
index be0a96d..fe5cdb6 100644
--- a/lib/maracasVisuLib/src/interface/CMakeLists.txt_CP
+++ b/lib/maracasVisuLib/src/interface/CMakeLists.txt_CP
@@ -1 +1 @@
-SUBDIRS(wxWindows)
+ADD_SUBDIRECTORY(wxWindows)
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt
index 29cc1aa..485d7ec 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt
+++ b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt
@@ -478,7 +478,7 @@ ELSE(WIN32)
 
 
 ENDIF(WIN32)
-SUBDIRS(widgets)
+ADD_SUBDIRECTORY(widgets)
 
 
 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.h
index ebb3132..9ab37ea 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.h
@@ -10,6 +10,13 @@
 #include <vtkColorTransferFunction.h>
 #include "vtkImageActor.h"
 
+#ifdef _DEBUG
+#include <crtdbg.h>
+#define DEBUG_NEW new(_NORMAL_BLOCK ,__FILE__, __LINE__)
+#else
+#define DEBUG_NEW new
+#endif
+
 class creaMaracasVisu_EXPORT vtkMPR3DDataViewer {
 public:
 	vtkMPR3DDataViewer();
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
index e1b7c37..5e63470 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
@@ -13,7 +13,9 @@
 #include "pPlotter/HistogramDialog.h"
 
 
-
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h
index bf91c74..dedb166 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h
@@ -55,7 +55,12 @@
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 //------------------------------------------------------------------
-
+#ifdef _DEBUG
+#include <crtdbg.h>
+#define DEBUG_NEW new(_NORMAL_BLOCK ,__FILE__, __LINE__)
+#else
+#define DEBUG_NEW new
+#endif
 class creaMaracasVisu_EXPORT vtkMPRBaseData: public vtkBaseData{
 public:
 	vtkMPRBaseData();
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
index 1f2ee80..f0f23f9 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
@@ -2,7 +2,9 @@
 
 #include "vtkInteractorStyleBaseView3D.h"
 
-
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 wxVtk3DBaseView::wxVtk3DBaseView(wxWindow *parent)
 :wxVtkBaseView( parent )
 {
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.h
index 8ab8755..55018eb 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.h
@@ -2,7 +2,12 @@
 #define WXVTK3DBASEVIEW_H_
 
 #include "wxVtkBaseView.h"
-
+#ifdef _DEBUG
+#include <crtdbg.h>
+#define DEBUG_NEW new(_NORMAL_BLOCK ,__FILE__, __LINE__)
+#else
+#define DEBUG_NEW new
+#endif
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 //------------------------------------------------------------------
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
index 2283e0e..8833e71 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
@@ -36,6 +36,7 @@
 //class vtkInteractorStyleBaseView;  
  */
 
+
 #include "vtkInteractorStyleImage.h"
 
 class creaMaracasVisu_EXPORT wxVtkBaseView{
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
index 319e00c..179f325 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
@@ -16,6 +16,11 @@
 #include "vtkProperty.h"
 #include "vtkCellPicker.h"
 
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
 wxVtkMPR3DView::wxVtkMPR3DView( wxVtk3DBaseView *wxvtk3Dbaseview )
 {
 	_wxvtk3Dbaseview			=	wxvtk3Dbaseview;
-- 
2.45.1