From: guigues <guigues>
Date: Fri, 1 Feb 2008 13:06:28 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~298
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4b6378ebef2d7d8e891f956a6c557a5c9e51b075;p=bbtk.git

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

diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake
index e388c04..a40daf5 100644
--- a/kernel/cmake/BBTKConfigurePackagePaths.cmake
+++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake
@@ -1,4 +1,5 @@
 # Use the installed appli 
+SET(BBTK_BIN_PATH ${PROJECT_BINARY_DIR})
 # TO DO : use computed path for build/install tree
 SET(BBTK_BBI bbi)
 SET(BBTK_BBFY bbfy)
diff --git a/kernel/cmake/BBTKWxWidgets.cmake b/kernel/cmake/BBTKWxWidgets.cmake
index 4de976b..94be3b2 100644
--- a/kernel/cmake/BBTKWxWidgets.cmake
+++ b/kernel/cmake/BBTKWxWidgets.cmake
@@ -35,6 +35,9 @@ MACRO(BBTK_FIND_WXWIDGETS)
     # SET(wxWidgets_USE_LIBS base core gl)
     FIND_PACKAGE( wxWidgets REQUIRED) 
     #
+    IF(wxWidgets_FOUND)
+      MESSAGE(STATUS "Looking for wxWidgets... found ${wxWidgets_CONFIG_EXECUTABLE}")
+    ENDIF(wxWidgets_FOUND)
   ENDIF(WIN32)
   
 
diff --git a/kernel/cmake/CMakeCreateFindPackage_UseLibrary.cmake.in b/kernel/cmake/CMakeCreateFindPackage_UseLibrary.cmake.in
index 890381e..b656bec 100644
--- a/kernel/cmake/CMakeCreateFindPackage_UseLibrary.cmake.in
+++ b/kernel/cmake/CMakeCreateFindPackage_UseLibrary.cmake.in
@@ -25,7 +25,8 @@ INCLUDE_DIRECTORIES(${@LIBRARY_NAME@_INCLUDE_DIRS})
 LINK_DIRECTORIES(${@LIBRARY_NAME@_LIBRARY_DIRS})
 
 # Set the version 
-ADD_DEFINITIONS( -D@LIBRARY_NAME@_VERSION="${@LIBRARY_NAME@_VERSION}" )
+# Already done in bbtkConfigure.h
+#ADD_DEFINITIONS( -D@LIBRARY_NAME@_VERSION="\"${@LIBRARY_NAME@_VERSION}\"" )
 
 # Additional use file 
 IF (@LIBRARY_NAME@_HAS_ADDITIONAL_CONFIG_FILE)
diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index 224861d..d39aa91 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/01/30 15:29:07 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2008/02/01 13:06:29 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -749,7 +749,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::SwitchToFile( \""
                          <<name<<"\")"<<std::endl);
 
-// to be remove in final version
+// to be removed in final version
 // use : Config v
 //verbose = true;
     std::vector<std::string> script_paths;
diff --git a/packages/void-bbtk-package.tgz b/packages/void-bbtk-package.tgz
index 924ef37..d3cc55b 100644
Binary files a/packages/void-bbtk-package.tgz and b/packages/void-bbtk-package.tgz differ