From b284bae4a4e8e20c766b348f01bb4b5d5bead96f Mon Sep 17 00:00:00 2001 From: guigues Date: Tue, 5 Feb 2008 09:38:31 +0000 Subject: [PATCH] *** empty log message *** --- kernel/cmake/BBTKConfigurePackage.cmake | 5 ----- kernel/cmake/bbtk_config_build.xml.in | 6 ++++-- kernel/src/bbtkInterpreter.cxx | 15 ++++++--------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake index dfcc6b1..f73f42e 100644 --- a/kernel/cmake/BBTKConfigurePackage.cmake +++ b/kernel/cmake/BBTKConfigurePackage.cmake @@ -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}") diff --git a/kernel/cmake/bbtk_config_build.xml.in b/kernel/cmake/bbtk_config_build.xml.in index 79df593..983602f 100644 --- a/kernel/cmake/bbtk_config_build.xml.in +++ b/kernel/cmake/bbtk_config_build.xml.in @@ -2,11 +2,13 @@ Sets the search directories in the build tree + @BBTK_DOC_BUILD_PATH@ + @BBTK_BBS_BUILD_PATH@ @EXECUTABLE_OUTPUT_PATH@ # For windows - @EXECUTABLE_OUTPUT_PATH@Debug - @EXECUTABLE_OUTPUT_PATH@Release + @EXECUTABLE_OUTPUT_PATH@\Debug + @EXECUTABLE_OUTPUT_PATH@\Release # @BBTK_DATA_ROOT@ diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index d0906a6..6d7b994 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -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& // 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, " [" <& if (find(mFileName.begin(),mFileName.end(),fullPathScriptName) !=mFileName.end()) { - bbtkMessage("Interpreter",1, - "file '"<open(fullPathScriptName.c_str()); -- 2.45.1