DEps

diff --git a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
index e8ccc376f365134fb2b1ae6eb6467ecdd05e2ab0..bd367ccc32244cd8c9a750dc2ed64aabe431c841 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
@@ -13,3 +13,13 @@
 #BBTK_CREATE_PACKAGE_BBDOC(${BBTK_PACKAGE_NAME})
 
 BBTK_DOC_INSTALL_IMAGES(bbdoc/${BBTK_PACKAGE_NAME})
+
+
+  IF(NOT WIN32)
+    # runs bbRegeneratePackageDoc and bbRegenerateBoxesLists 
+    # as a post install step
+    # does not work on windaube
+    IF(NOT BBTK_CORE_PACKAGE)
+      INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${BBTK_BIN_PATH}/bbRegeneratePackageDoc ${BBTK_PACKAGE_NAME} && ${BBTK_BIN_PATH}/bbRegenerateBoxesLists )")
+    ENDIF(NOT BBTK_CORE_PACKAGE)
+  ENDIF(NOT WIN32)

diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt
index 4d5aaedbdf33243d7256aa2d3ceaeb1f73641161..069119821c252297f3be3815378cef9734a40793 100644 (file)
--- a/kernel/doc/bbtkWebSite/CMakeLists.txt
+++ b/kernel/doc/bbtkWebSite/CMakeLists.txt
@@ -16,3 +16,42 @@ FOREACH(page ${HTML_PAGES})
     DESTINATION ${BBTK_DOC_INSTALL_PATH}/bbtkWebSite
     )
 ENDFOREACH(page)
+
+
+SET(INDEX_OUTPUT index-alpha.html)
+
+IF (WIN32)
+
+  SET(USE_DOT TRUE)
+  MAKE_DLL_PATH()
+
+   ADD_CUSTOM_COMMAND(
+     OUTPUT ${INDEX_OUTPUT}
+         COMMAND 
+     set ${DLL_PATH} cd ${BBTK_BIN_PATH} && ./bbRegeneratePackageDoc -a &&  ./bbRegenerateBoxesLists
+
+    DEPENDS ${BBTK_PACKAGES_DEPS}
+          )
+
+ELSE (WIN32)
+
+     MESSAGE(STATUS "PACKAGE_DEPS=${BBTK_PACKAGES_DEPS}")
+
+   SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
+            #   MESSAGE(LD_LIBRARY_PATH=${LD_LIBRARY_PATH})
+
+   ADD_CUSTOM_COMMAND(
+           OUTPUT ${INDEX_OUTPUT}
+            COMMAND 
+
+  cd ${BBTK_BIN_PATH} && export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ./bbRegeneratePackageDoc -a &&  ./bbRegenerateBoxesLists
+
+    DEPENDS ${BBTK_PACKAGES_DEPS}
+        )
+
+ENDIF (WIN32)
+
+ADD_CUSTOM_TARGET(bbdoc ALL
+         DEPENDS ${INDEX_OUTPUT}
+             )
+

diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx
index e0b39e2657a90ed279d9c06f50be126b86de6d44..4bde5cbe221519ef4ac00a8d0683b59571261378 100644 (file)
--- a/kernel/src/bbtkWxGUIScriptingInterface.cxx
+++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/08 14:46:42 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2008/10/09 14:38:57 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -494,8 +494,8 @@ namespace bbtk
     std::string command;
     command = ConfigurationFile::GetInstance().Get_bin_path();
     command += ConfigurationFile::GetInstance().Get_file_separator();
-    command += "bbRegeneratePackageDoc * && ";
-    command = ConfigurationFile::GetInstance().Get_bin_path();
+    command += "bbRegeneratePackageDoc -a && ";
+    command += ConfigurationFile::GetInstance().Get_bin_path();
     command += ConfigurationFile::GetInstance().Get_file_separator();
     command += "bbRegenerateBoxesLists";
        bbtkMessage("debug",1,"Executing system command '"<<command<<"'"<<std::endl);

diff --git a/packages/CMakeLists.txt b/packages/CMakeLists.txt
index 5b93776962e603fa458175c48b0c4842b5b8cf46..81f38064f253bb6ab14575da8bb3f1960295eb2f 100644 (file)
--- a/packages/CMakeLists.txt
+++ b/packages/CMakeLists.txt
@@ -7,5 +7,6 @@ SUBDIRS(vtk)
 SUBDIRS(toolsbbtk)
 SUBDIRS(wxvtk)
 SUBDIRS(itkvtk)
+SUBDIRS(demo)
 #SUBDIRS(creaReaders)
 #-----------------------------------------------------------------------------