]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Tue, 5 Feb 2008 09:38:31 +0000 (09:38 +0000)
committerguigues <guigues>
Tue, 5 Feb 2008 09:38:31 +0000 (09:38 +0000)
kernel/cmake/BBTKConfigurePackage.cmake
kernel/cmake/bbtk_config_build.xml.in
kernel/src/bbtkInterpreter.cxx

index dfcc6b108d62d8a157081dbba7d87139e6c3bdf3..f73f42e24ffa997b429ec50a8c2bedcaf48f5974 100644 (file)
@@ -22,12 +22,7 @@ SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
   
 #-----------------------------------------------------------------------------
 # Package dependencies
-#IF(UNIX)
 SET(${BBTK_PACKAGE_NAME}_DEPS bb${BBTK_PACKAGE_NAME})
-#${EXECUTABLE_OUTPUT_PATH}/libbb${BBTK_PACKAGE_NAME}.so)
-#ELSE(UNIX)
-#SET(${BBTK_PACKAGE_NAME}_DEPS ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbs)
-#ENDIF(UNIX)
 STRING(REGEX MATCH "${${BBTK_PACKAGE_NAME}_DEPS}" 
   ${BBTK_PACKAGE_NAME}_IN_DEPS
   "${BBTK_PACKAGES_DEPS}")
index 79df5936abba2e46ebd98707455723294638ee29..983602f35979ccb5cb3b70d37c3ca713b60b825d 100644 (file)
@@ -2,11 +2,13 @@
 
   <description> Sets the search directories in the build tree </description>
 
+  <url> @BBTK_DOC_BUILD_PATH@ </url> 
+
   <bbs_path> @BBTK_BBS_BUILD_PATH@ </bbs_path>
   <package_path> @EXECUTABLE_OUTPUT_PATH@ </package_path> 
 # For windows
-  <package_path> @EXECUTABLE_OUTPUT_PATH@Debug </package_path> 
-  <package_path> @EXECUTABLE_OUTPUT_PATH@Release </package_path> 
+  <package_path> @EXECUTABLE_OUTPUT_PATH@\Debug </package_path> 
+  <package_path> @EXECUTABLE_OUTPUT_PATH@\Release </package_path> 
 #
   <data_path> @BBTK_DATA_ROOT@ </data_path>
 
index d0906a67bcdfb3a68e3759887379851b03b7240d..6d7b994a1e35193a47a5448d1ba6b1a57d36b283 100644 (file)
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/02/05 08:25:22 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2008/02/05 09:38:31 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -898,12 +898,12 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.
-         bbtkMessage("Interpreter",1,
+         bbtkMessage("Interpreter",2,
                      "   [" <<fullPathScriptName <<"] : doesn't exist" 
                      <<std::endl);
           continue;  // try next path
         }
-       bbtkMessage("Interpreter",1,
+       bbtkMessage("Interpreter",2,
                    "   [" <<fullPathScriptName 
                    <<"] : found" <<std::endl);        
         foundFile = true;
@@ -937,14 +937,11 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     if (find(mFileName.begin(),mFileName.end(),fullPathScriptName)
        !=mFileName.end()) 
       {
-       bbtkMessage("Interpreter",1,
-                   "file '"<<fullPathScriptName
-                   <<"' already open : do not open it once more to prevent recursive inclusion"<<std::endl);
+       bbtkMessage("Interpreter",1,"file '"<<fullPathScriptName
+                   <<"' already open : I do not open it once more to prevent recursive inclusion"<<std::endl);
        return;
       }
 
-    bbtkMessage("Interpreter",1,fullPathScriptName<<" found"<<std::endl);
-
     std::ifstream* s;      
     s = new std::ifstream;
     s->open(fullPathScriptName.c_str());