]> Creatis software - creaMaracasVisu.git/commitdiff
change SUBDIRS (deprecate functionality) to ADD_SUBDIRECTORY
authorFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Wed, 10 Nov 2010 15:36:56 +0000 (15:36 +0000)
committerFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Wed, 10 Nov 2010 15:36:56 +0000 (15:36 +0000)
16 files changed:
CMakeLists.txt
lib/CMakeLists.txt
lib/maracasVisuLib/CMakeLists.txt
lib/maracasVisuLib/src/CMakeLists.txt
lib/maracasVisuLib/src/CMakeListsWorking.txt_CP
lib/maracasVisuLib/src/CutModule/CMakeLists.txt
lib/maracasVisuLib/src/interface/CMakeLists.txt
lib/maracasVisuLib/src/interface/CMakeLists.txt_CP
lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt
lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx

index 858c157..afd1471 100644 (file)
@@ -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 )
 
index d134e4a..a00aa43 100644 (file)
@@ -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)
index 47a9c24..9e220bd 100644 (file)
@@ -233,4 +233,4 @@ ENDIF(WIN32)
   #---------------------------------------------------------------------------
 ENDIF ( BUILD_${LIBRARY_NAME} )
 
-SUBDIRS(src)
+ADD_SUBDIRECTORY(src)
index a52a32a..2fd579c 100644 (file)
@@ -20,7 +20,7 @@ IF ( BUILD_${LIBRARY_NAME} )#---------------------------------------------------
     interface
     kernel     
 )    
-  SUBDIRS(interface)
-  SUBDIRS(kernel)
+  ADD_SUBDIRECTORY(interface)
+  ADD_SUBDIRECTORY(kernel)
 ENDIF ( BUILD_${LIBRARY_NAME} )
 
index ebb3132..9ab37ea 100644 (file)
 #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();
index e1b7c37..5e63470 100644 (file)
@@ -13,7 +13,9 @@
 #include "pPlotter/HistogramDialog.h"
 
 
-
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
index bf91c74..dedb166 100644 (file)
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 //------------------------------------------------------------------
-
+#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();
index 1f2ee80..f0f23f9 100644 (file)
@@ -2,7 +2,9 @@
 
 #include "vtkInteractorStyleBaseView3D.h"
 
-
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 wxVtk3DBaseView::wxVtk3DBaseView(wxWindow *parent)
 :wxVtkBaseView( parent )
 {
index 8ab8755..55018eb 100644 (file)
@@ -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
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 //------------------------------------------------------------------
index 2283e0e..8833e71 100644 (file)
@@ -36,6 +36,7 @@
 //class vtkInteractorStyleBaseView;  
  */
 
+
 #include "vtkInteractorStyleImage.h"
 
 class creaMaracasVisu_EXPORT wxVtkBaseView{
index 319e00c..179f325 100644 (file)
 #include "vtkProperty.h"
 #include "vtkCellPicker.h"
 
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
 wxVtkMPR3DView::wxVtkMPR3DView( wxVtk3DBaseView *wxvtk3Dbaseview )
 {
        _wxvtk3Dbaseview                        =       wxvtk3Dbaseview;