change SUBDIRS (deprecate functionality) to ADD_SUBDIRECTORY

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 858c157e1edfbf7174afc0e4fd44fd270150ed37..afd1471cae89cc4bf0cc6ceb33c03f95ba4eb591 100644 (file)
--- 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 d134e4a2265d44705332472207d2fea20555fdc9..a00aa43af4fcfb74d034927f2f7dae719a0a89e4 100644 (file)
--- 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 47a9c245653615b7efa51257d2c3abe6c0863d8e..9e220bd79f3bb1879bf6f503ce27bd9f03d7b2c1 100644 (file)
--- 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 1182ea541fe95a1cc270e1ad20e18cf57bd4041e..fab325632368a99cd1b0d42133aefeb02c4bc090 100644 (file)
--- 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 9e8488a981868730d7f1bb8892ff872afca65208..f097130ea25db15987cca7f065a6f1d65a6a45ca 100644 (file)
--- 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 a52a32a5a92032a795b2febb484340c5353a3507..2fd579c61cf63faa4180801393774b848116ef9a 100644 (file)
--- 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 be0a96dde84917c8d1ce7a9e26436b9efa316ea7..fe5cdb632a41bfc6d8dd7416e2f8eaa815bdd4a5 100644 (file)
--- 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 be0a96dde84917c8d1ce7a9e26436b9efa316ea7..fe5cdb632a41bfc6d8dd7416e2f8eaa815bdd4a5 100644 (file)
--- 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 29cc1aac33d93b0c3ad1bace90484fc9fa1f4753..485d7ecfb4b226cb202749ec131b60e36e24b265 100644 (file)
--- 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 ebb313238d38bcf54911a4f0d5b55b49c069f20e..9ab37eae85f3cff8fb71a31c7a5f0113a5332009 100644 (file)
--- 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 e1b7c370dec6bffd60f649ef9622cb86dc43fd17..5e63470d34661172610a17e09625d5c9f20f4dd7 100644 (file)
--- 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 bf91c7479eb81044ab4af196676dfe4653631ef7..dedb16648d753b0458531d220d86011c38b9545f 100644 (file)
--- 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 1f2ee8024dd4e8d0b45ae5cbca3f3bd836fea8dd..f0f23f93aadd16245861a610aa91109beb737cf0 100644 (file)
--- 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 8ab87550c30e6837007d28eae3b4dba5ca319892..55018ebc21f300ff5193db891eee930d10487135 100644 (file)
--- 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 2283e0e40ce936a51e32a961880ca241325f567a..8833e716e54bf3a114542ab3e7cc76d183785e3b 100644 (file)
--- 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 319e00c1c693fb292a22b196a0f14b3254932423..179f325554b6a69f48437ffc82c9d2d9ce06eaff 100644 (file)
--- 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;