]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Mon, 21 Apr 2008 07:01:51 +0000 (07:01 +0000)
committerguigues <guigues>
Mon, 21 Apr 2008 07:01:51 +0000 (07:01 +0000)
kernel/appli/bbc/main.cxx.in
kernel/cmake/BBTKAddDefinitions.cmake
kernel/src/CMakeLists.txt
kernel/src/bbtkTranscriptor.cxx

index 47e150a1c34f98c4e7a80fcc517df654541af5ca..61ba8dafdb7e5837dde787730ff92157e843ab41 100644 (file)
@@ -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*);
index 9831d477ee1d59c894215fd2b607ee323ec0cc48..6568de740afd94800147a649dc9c70b21a5f8bb5 100644 (file)
@@ -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__)
 #-----------------------------------------------------------------------------
index a2933c56d337812dfcc38e033795a06c74df5720..d8114d4ea794f7da9e814829b6429fc53d8cec82 100644 (file)
@@ -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 
index 41ca87d216d812a09825009c9dfd613fce2e5224..258ad8379d80b3600d3c30508b2b8a9b5b3aa617 100644 (file)
@@ -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;
 
     /*