*** empty log message ***

diff --git a/kernel/cmake/BBTKDefineOptions.cmake b/kernel/cmake/BBTKDefineOptions.cmake
index e604473e49bb55d6753981f5387459040d63ae33..3ef49fcd30901ba19e1f43dc792f1698d5723ed5 100644 (file)
--- a/kernel/cmake/BBTKDefineOptions.cmake
+++ b/kernel/cmake/BBTKDefineOptions.cmake
@@ -53,6 +53,8 @@ ENDIF(BUILD_BBTK_DOC)
 
 #-----------------------------------------------------------------------------
 # BOOST C++
-OPTION(BBTK_USE_INTERNAL_BOOST "Use the internal boost C++ library" OFF)
+SET(BBTK_SHIPPED_BOOST boost_1_35_0 CACHE INTERNAL "Shipped boost dir" FORCE)
+OPTION(BBTK_USE_SHIPPED_BOOST 
+  "Use the shipped boost C++ library (${BBTK_SHIPPED_BOOST})" ON)
 #-----------------------------------------------------------------------------
 

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index f140447fdb1fa5781a2a7d1aa12af60f8e065c7c..f39f1ebf40ab5f8abee1f25d571b1adaf16b3bd3 100644 (file)
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -168,15 +168,30 @@ ENDIF(USE_TTH)
 
 
 #-----------------------------------------------------------------------------
-# TO DO : FIND BOOST 
-SET(USE_BOOST TRUE)
 IF(USE_BOOST)
-  FIND_PACKAGE(Boost REQUIRED)
-  MESSAGE(STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIRS}")
-  INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-  LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS} )
-  SET(BBTK_BOOST_LIBRARIES
-    boost_signals
-    )  
+  IF(BBTK_USE_SHIPPED_BOOST)
+    MESSAGE(STATUS "bbtk uses shipped boost C++ library (${BBTK_SHIPPED_BOOST})")
+    INCLUDE_DIRECTORIES( 
+      ${PROJECT_SOURCE_DIR}/kernel/src/ThirdParty/${BBTK_SHIPPED_BOOST})
+
+
+    SET(BBTK_BOOST_LIBRARIES
+      bbtk_boost_signals
+      )  
+
+  ELSE(BBTK_USE_SHIPPED_BOOST)
+    FIND_PACKAGE(Boost REQUIRED)
+    MARK_AS_ADVANCED(Boost_INCLUDE_DIR)
+    IF(Boost_FOUND)
+      MESSAGE(STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIR}")
+      INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+      LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS} )
+      SET(BBTK_BOOST_LIBRARIES
+       boost_signals
+       )
+    ELSE(Boost_FOUND)
+      MESSAGE(FATAL_ERRO "boost C++ library not found - either set Boost_INCLUDE_DIR or set BBTK_USE_SHIPPED_BOOST to ON to use shipped ${BBTK_SHIPPED_BOOST}")
+    ENDIF(Boost_FOUND)
+  ENDIF(BBTK_USE_SHIPPED_BOOST)
 ENDIF(USE_BOOST)
 #-----------------------------------------------------------------------------

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 8987f72d724c77175c53ecc8adf305bbee9513ba..078fffd77e4ef4926da835ae08201d9b0b2ed874 100644 (file)
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -93,7 +93,10 @@ ENDIF(BBTK_USE_WXWIDGETS)
 
 #-----------------------------------------------------------------------------
 # BOOST 
+SET(BBTK_USE_BOOST TRUE)
+
 IF(BBTK_USE_BOOST)
+  SET(USE_BOOST ON CACHE BOOL "Use boost C++ library" FORCE)
   SET(BBTK_LINK_LIBRARIES
     ${BBTK_LINK_LIBRARIES}
     ${BBTK_BOOST_LIBRARIES} 
@@ -110,6 +113,8 @@ IF(UNIX)
 ENDIF(UNIX)
 #-----------------------------------------------------------------------------
 
+MESSAGE(STATUS "bbtk link libraries = ${BBTK_LINK_LIBRARIES}")
+
 #-----------------------------------------------------------------------------
 # EO bbtk library dependencies
 #-----------------------------------------------------------------------------
@@ -154,17 +159,17 @@ ENDIF(NOT BBTK_INSTALL_NO_DEVELOPMENT)
 
 
 
-
 #-----------------------------------------------------------------------------
 # bbtk library creation
 #-----------------------------------------------------------------------------
 # Symbols must be exported (Windows)
 ADD_DEF(BBTK_EXPORT_SYMBOLS)
 
-ADD_DEFINITIONS(-DCHECKBOXVIEW=1)
+#ADD_DEFINITIONS(-DCHECKBOXVIEW=1)
 #-----------------------------------------------------------------------------
 # Sources files 
-FILE(GLOB SOURCES "." "*.cxx" "*.cpp" "ThirdParty/wx/treemultictrl/*.cpp")
+FILE(GLOB SOURCES "." "*.cxx" "*.cpp") 
+# "ThirdParty/wx/treemultictrl/*.cpp")
 FILE(GLOB SOURCES_H "." "*.h" )
 #-----------------------------------------------------------------------------
 # lib definition
@@ -260,6 +265,10 @@ CMAKE_CREATE_FIND_PACKAGE(${LIBRARY_NAME})
 #-----------------------------------------------------------------------------
 
 
+#-----------------------------------------------------------------------------
+# Recurse in ThirdParty to build the needed libs
+SUBDIRS(ThirdParty)
+#-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # EOF

diff --git a/kernel/src/ThirdParty/CMakeLists.txt b/kernel/src/ThirdParty/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1b468bd
--- /dev/null
+++ b/kernel/src/ThirdParty/CMakeLists.txt
@@ -0,0 +1,6 @@
+#-----------------------------------------------------------------------------
+# If bbtk uses shipped boost then recurse in boost to build the needed libs
+IF(BBTK_USE_SHIPPED_BOOST)
+  SUBDIRS(${BBTK_SHIPPED_BOOST})
+ENDIF(BBTK_USE_SHIPPED_BOOST)
+#-----------------------------------------------------------------------------

diff --git a/kernel/src/bbtkWxGUIPackageBrowser.cxx b/kernel/src/bbtkWxGUIPackageBrowser.cxx
index 9ab9e50f563cb10b471f93d595dcfe73fb549c86..18de91fff0fc1b359dda7509231beec5a33e10d9 100644 (file)
--- a/kernel/src/bbtkWxGUIPackageBrowser.cxx
+++ b/kernel/src/bbtkWxGUIPackageBrowser.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIPackageBrowser.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/24 10:11:28 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/04/24 13:56:34 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -29,7 +29,7 @@
  * \brief 
  */
 
-
+/*
 #ifdef _USE_WXWIDGETS_
 
 #define CHECKBOXVIEW 1
@@ -112,14 +112,6 @@ namespace bbtk
       out.push_back(name);
       out.push_back(type);
       out.push_back(descr);
-      /* = 
-       "<TR><TD style='vertical-align: top;' bgcolor=\"" + col
-       +"\"><B><PRE> "+name+" </PRE></B></TD>"
-       + "<TD style='vertical-align: top;' bgcolor=\""+col
-       +"\"><I><PRE> "+type+" </PRE></I></TD>"
-       + "<TD style='vertical-align: top;' bgcolor=\""+col
-       +"\">"+descr+"</TD></TR>\n";
-      */
 
       if (iotype==0) user_defined.push_back(out);
       else if (iotype==1) ubb_defined.push_back(out);
@@ -140,25 +132,6 @@ namespace bbtk
     std::vector<std::vector<std::string> >::iterator hi;
     for (hi=user_defined.begin();hi!=user_defined.end();++hi) 
       {
-       /*
-       wxTextCtrl* t = new wxTextCtrl(this,-1,_T("")
-                                      ,wxDefaultPosition
-                                      ,wxDefaultSize 
-                                      ,wxTE_READONLY
-                                      );
-       t->SetDefaultStyle(ionameattr);
-       t->AppendText( std2wx((*hi)[0]) );
-       grid->Add(t);
-       
-       t =  new wxTextCtrl(this,-1,_T("")
-                                      ,wxDefaultPosition
-                                      ,wxDefaultSize 
-                                      ,wxTE_READONLY
-                                      );
-       t->SetDefaultStyle(iotypeattr);
-       t->AppendText( std2wx((*hi)[1]) );
-       grid->Add(t);
-       */
        
        grid->Add( new wxStaticText(this,-1,std2wx((*hi)[0])));
        grid->Add( new wxStaticText(this,-1,std2wx((*hi)[1])));
@@ -229,14 +202,6 @@ namespace bbtk
       out.push_back(name);
       out.push_back(type);
       out.push_back(descr);
-      /* = 
-       "<TR><TD style='vertical-align: top;' bgcolor=\"" + col
-       +"\"><B><PRE> "+name+" </PRE></B></TD>"
-       + "<TD style='vertical-align: top;' bgcolor=\""+col
-       +"\"><I><PRE> "+type+" </PRE></I></TD>"
-       + "<TD style='vertical-align: top;' bgcolor=\""+col
-       +"\">"+descr+"</TD></TR>\n";
-      */
 
       if (iotype==0) user_defined.push_back(out);
       else if (iotype==1) ubb_defined.push_back(out);
@@ -421,7 +386,7 @@ namespace bbtk
     //    WxGUICommand* com = new WxGUICommand(this,this);
     //    sizer->Add(com);
     
-    SetSizer(sizer);
+    SetSizer(sizer); 
 
 
     // Creates the parent window of all bbtk windows as a child of this
@@ -444,3 +409,4 @@ namespace bbtk
 
 
 #endif //_USE_WXWIDGETS_
+*/

diff --git a/kernel/src/bbtkWxGUIPackageBrowser.h b/kernel/src/bbtkWxGUIPackageBrowser.h
index 35327bf73a6836fba67aca7b4164f9f42917aa1a..b5d8c7c915d49255c694751efab55f4165e1c138 100644 (file)
--- a/kernel/src/bbtkWxGUIPackageBrowser.h
+++ b/kernel/src/bbtkWxGUIPackageBrowser.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIPackageBrowser.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:16 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/04/24 13:56:34 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -29,7 +29,7 @@
  * \brief 
  */
 
-
+/*
 #ifdef _USE_WXWIDGETS_
 
        
@@ -124,3 +124,4 @@ namespace bbtk
 #endif // __bbtkWxGUIPackageBrowser_h__
 
 #endif //_USE_WXWIDGETS_
+*/