From: guigues <guigues>
Date: Mon, 21 Apr 2008 07:01:51 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~71
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d7fb51b4b79c28f4c70137f12db8cfe9ea7f87b8;p=bbtk.git

*** empty log message ***
---

diff --git a/kernel/appli/bbc/main.cxx.in b/kernel/appli/bbc/main.cxx.in
index 47e150a..61ba8da 100644
--- a/kernel/appli/bbc/main.cxx.in
+++ b/kernel/appli/bbc/main.cxx.in
@@ -30,7 +30,7 @@ class wxBBIApp : public wxApp
 {
 public:
   bool OnInit( );
-  int  OnExit() { delete mExecuter; return true; }
+  int  OnExit() { return true; }
   void OnInitCmdLine(wxCmdLineParser& parser);
   bool OnCmdLineParsed(wxCmdLineParser& parser);
   void Run(bbtk::Interpreter*);
diff --git a/kernel/cmake/BBTKAddDefinitions.cmake b/kernel/cmake/BBTKAddDefinitions.cmake
index 9831d47..6568de7 100644
--- a/kernel/cmake/BBTKAddDefinitions.cmake
+++ b/kernel/cmake/BBTKAddDefinitions.cmake
@@ -21,4 +21,6 @@ ENDIF (BBTK_COMPILE_WARNING_MESSAGES)
 IF (BBTK_COMPILE_ERROR_MESSAGES) 
   ADD_DEF( BBTK_COMPILE_ERROR_MESSAGES )
 ENDIF (BBTK_COMPILE_ERROR_MESSAGES) 
+
+ADD_DEF(_USE_BOOST__)
 #-----------------------------------------------------------------------------
diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index a2933c5..d8114d4 100644
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -207,7 +207,7 @@ ENDIF(WIN32)
 SET(LIBRARY_NAME BBTK)
 SET(${LIBRARY_NAME}_INSTALL_FOLDER bbtk)
 SET(${LIBRARY_NAME}_LIBRARIES bbtk)
-SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS kernel/src)
+SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS kernel/src kernel/src/ThirdParty)
 IF(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
     ${EXECUTABLE_OUTPUT_REL_PATH})
@@ -216,7 +216,7 @@ ELSE(UNIX)
     ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
     ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
 ENDIF(UNIX)
-SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/bbtk)
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/bbtk include/bbtk/ThirdParty)
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
 
 # OPTIONAL 
diff --git a/kernel/src/bbtkTranscriptor.cxx b/kernel/src/bbtkTranscriptor.cxx
index 41ca87d..258ad83 100644
--- a/kernel/src/bbtkTranscriptor.cxx
+++ b/kernel/src/bbtkTranscriptor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkTranscriptor.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:16 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2008/04/21 07:01:52 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -59,7 +59,7 @@ namespace bbtk
     file = bbtk::Utilities::ExtractScriptName(filename,path);
     
     m_Fp << "#include \"bbtkExecuter.h\"" << std::endl; 
-    m_Fp << "void " << file << "(bbtk::Executer* e)"<<std::endl;
+    m_Fp << "void " << file << "(bbtk::Executer::Pointer e)"<<std::endl;
     m_Fp << "{"<<std::endl;
 
     /*