*** empty log message ***

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index 7d4c3b7ea228b1afa23c2ee281e11aa124847b98..2cea2fc52b3cb14cfb78afc79bff0e2a9f1f2dd1 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -105,20 +105,6 @@ MESSAGE(STATUS "deps=${BBTK_PACKAGES_DEPS}")
 
   #---------------------------------------------------------------------------
 
-  #----------------------------------------------------------------------------
-  # DEFINES ${PACKAGE_NAME}_AUTHOR
-  # ADD_DEFINITIONS( -D${PACKAGE_NAME}_AUTHOR="${PACKAGE_AUTHOR}")
-  #----------------------------------------------------------------------------
-  #----------------------------------------------------------------------------
-  # DEFINES ${PACKAGE_NAME}_DESCRIPTION
-  # ADD_DEFINITIONS( -D${PACKAGE_NAME}_DESCRIPTION="${PACKAGE_DESCRIPTION}")
-  #----------------------------------------------------------------------------
-  #----------------------------------------------------------------------------
-  # DEFINES ${BBTK_PACKAGE_NAME}_VERSION
-  SET(${BBTK_PACKAGE_NAME}_VERSION 
-    "${${BBTK_PACKAGE_NAME}_MAJOR_VERSION}.${${BBTK_PACKAGE_NAME}_MINOR_VERSION}.${${BBTK_PACKAGE_NAME}_BUILD_VERSION}")
-  #ADD_DEFINITIONS( -D${${BBTK_PACKAGE_NAME}_NAME}_VERSION=${${BBTK_PACKAGE_NAME}_VERSION})
-  #----------------------------------------------------------------------------
   
   
   #---------------------------------------------------------------------------

diff --git a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
index f48e1d0131503ac99cfcc7b35b573fb4b5cb4e66..665668b22e1f4311e503ba3d3c3046669e44adb5 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
@@ -1,7 +1,11 @@
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/header.html.in
-   ${CMAKE_CURRENT_BINARY_DIR}/header.html
-   )
+  ${CMAKE_CURRENT_BINARY_DIR}/header.html
+  )
+INSTALL( 
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/header.html
+  DESTINATION ${BBTK_BBDOC_INSTALL_PATH}/${PACKAGE_NAME}
+  )   
 
 
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKCreatePackageBBdoc.cmake)

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 2fcd9ded4a8853293606385b2c71be745cee442e..967fbde369c8fb42e6377287c64b274c030938b1 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -14,6 +14,19 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} )
 INCLUDE_DIRECTORIES(../${${BBTK_PACKAGE_NAME}_INCLUDE_DIRS})
 #----------------------------------------------------------------------------
 
+#----------------------------------------------------------------------------
+# VARS CONFIGURED IN bbPackage.h 
+SET(BBTK_PACKAGE_AUTHOR        "\"${${BBTK_PACKAGE_NAME}_AUTHOR}\"")
+SET(BBTK_PACKAGE_DESCRIPTION   "\"${${BBTK_PACKAGE_NAME}_DESCRIPTION}\"")
+SET(BBTK_PACKAGE_MAJOR_VERSION ${${BBTK_PACKAGE_NAME}_MAJOR_VERSION})
+SET(BBTK_PACKAGE_MINOR_VERSION ${${BBTK_PACKAGE_NAME}_MINOR_VERSION})
+SET(BBTK_PACKAGE_BUILD_VERSION ${${BBTK_PACKAGE_NAME}_BUILD_VERSION})
+SET(BBTK_PACKAGE_VERSION 
+  "\"${${BBTK_PACKAGE_NAME}_MAJOR_VERSION}.${${BBTK_PACKAGE_NAME}_MINOR_VERSION}.${${BBTK_PACKAGE_NAME}_BUILD_VERSION}\"")
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+
 #----------------------------------------------------------------------------
 # CREATES bb${BBTK_PACKAGE_NAME}Package.h
 CONFIGURE_FILE(
@@ -167,11 +180,6 @@ SET(BBTK_PACKAGE_USE_GDCM ${${BBTK_PACKAGE_NAME}_USE_GDCM})
 SET(BBTK_PACKAGE_USE_GSMIS ${${BBTK_PACKAGE_NAME}_USE_GSMIS})
 SET(BBTK_PACKAGE_USE_WXWIDGETS ${${BBTK_PACKAGE_NAME}_USE_WXWIDGETS})
 SET(BBTK_PACKAGE_USE_PACKAGES  ${${BBTK_PACKAGE_NAME}_USE_PACKAGES})
-SET(BBTK_PACKAGE_AUTHOR        "\"${${BBTK_PACKAGE_NAME}_AUTHOR}\"")
-SET(BBTK_PACKAGE_DESCRIPTION   "\"${${BBTK_PACKAGE_NAME}_DESCRIPTION}\"")
-SET(BBTK_PACKAGE_MAJOR_VERSION ${${BBTK_PACKAGE_NAME}_MAJOR_VERSION})
-SET(BBTK_PACKAGE_MINOR_VERSION ${${BBTK_PACKAGE_NAME}_MINOR_VERSION})
-SET(BBTK_PACKAGE_BUILD_VERSION ${${BBTK_PACKAGE_NAME}_BUILD_VERSION})
 SET(BBTK_PACKAGE_INCLUDE_DIRS  ${${BBTK_PACKAGE_NAME}_INCLUDE_DIRS})
 SET(BBTK_PACKAGE_LIBS          ${${BBTK_PACKAGE_NAME}_LIBS})
 

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index 7927988f3e61392b44c9db0b7bb9bd0f7acccb8f..a163dc744eb7919b5a779ad602a9ffb63097f8d0 100644 (file)
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -19,18 +19,12 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
     "include ${PACKAGE_NAME}-appli\n"
     "#-----------------------------------------\n"
     "graph ${PACKAGE_NAME} 0 0 ${DOC_OUTPUT} \"${CMAKE_CURRENT_BINARY_DIR}/header.html\" \"Package ${PACKAGE_NAME} documentation\"\n"
-#${BBTK_DOCUMENT_SCRIPTS_OUTPUT_PATH}/header.html 
     )
-#  CONFIGURE_FILE(
-#    ${OUTPUT_FILE}
-#    ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/appli/make_doc_${PACKAGE_NAME}.bbs
-#     COPYONLY
-#    )
-#  INSTALL(
-#      FILES ${OUTPUT_FILE}
-#      DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/appli
-#    )
-
+  INSTALL(
+    FILES ${OUTPUT_FILE}
+    DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/appli
+    )
+  
   ADD_CUSTOM_COMMAND(
     OUTPUT ${DOC_OUTPUT}
     COMMAND 
@@ -40,12 +34,13 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
   ADD_CUSTOM_TARGET(bbdoc_${PACKAGE_NAME} ALL
     DEPENDS ${DOC_OUTPUT}
     )
-  # Install
-#  INSTALL( 
-#    FILES ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.html
-#    DESTINATION ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_INSTALL_PATH}/${TEX_FILE}
-#    )   
 
+  INSTALL( 
+    DIRECTORY ${BBTK_BBDOC_BUILD_PATH}/${PACKAGE_NAME}
+    DESTINATION ${BBTK_BBDOC_INSTALL_PATH}
+    )   
+  
 
+  
 ENDMACRO(BBTK_CREATE_PACKAGE_BBDOC NAME)
 

diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
index 383583fa222fcd8de2cd2aab2ed9527b95c931b2..620c8a06e1c0e0346427b8071a72e16cce97095d 100644 (file)
--- a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
+++ b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
@@ -32,11 +32,12 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
     CONFIGURE_FILE(
       ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
       ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
-     COPYONLY
-    )
+      COPYONLY
+      )
+    GET_FILENAME_COMPONENT(bbs_path ${bbs} PATH)
     INSTALL(
       FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
-      DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
+      DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path}
     )
 
   ENDFOREACH(bbs)
@@ -79,9 +80,10 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
       ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
       COPYONLY
       )
+    GET_FILENAME_COMPONENT(bbs_path ${bbs} PATH)
     INSTALL(
       FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
-      DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
+      DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path}
       )
   ENDFOREACH(bbs)
   FILE(APPEND 

diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake
index c314293c98147f4f3acc97930fae8a9528ed376c..56d5e08ba8ec7eb13a1916cabcc444dada3261bf 100644 (file)
--- a/kernel/cmake/BBTKSetDeducedPaths.cmake
+++ b/kernel/cmake/BBTKSetDeducedPaths.cmake
@@ -37,18 +37,19 @@ SET(CMakeCreateFindPackage_DIR ${BBTK_CMAKE_DIR})
 
 #-----------------------------------------------------------------------------
 # Dependencies added only the first time !
-IF(EXISTS ${BBTK_BBI})
-  SET(BBTK_BBI_DEPENDENCY)
-ELSE(EXISTS ${BBTK_BBI})
-  SET(BBTK_BBI_DEPENDENCY ${BBTK_BBI})
-ENDIF(EXISTS ${BBTK_BBI})
-
-
-IF(EXISTS ${BBTK_BBFY})
-  SET(BBTK_BBFY_DEPENDENCY)
-ELSE(EXISTS ${BBTK_BBFY})
-  SET(BBTK_BBFY_DEPENDENCY ${BBTK_BBFY})
-ENDIF(EXISTS ${BBTK_BBFY})
-
+IF(BBTK_CORE_PACKAGE)
+  IF(EXISTS ${BBTK_BBI})
+    SET(BBTK_BBI_DEPENDENCY)
+  ELSE(EXISTS ${BBTK_BBI})
+    SET(BBTK_BBI_DEPENDENCY ${BBTK_BBI})
+  ENDIF(EXISTS ${BBTK_BBI})
+  
+  
+  IF(EXISTS ${BBTK_BBFY})
+    SET(BBTK_BBFY_DEPENDENCY)
+  ELSE(EXISTS ${BBTK_BBFY})
+    SET(BBTK_BBFY_DEPENDENCY ${BBTK_BBFY})
+  ENDIF(EXISTS ${BBTK_BBFY})
+ENDIF(BBTK_CORE_PACKAGE)
 #-----------------------------------------------------------------------------
 

diff --git a/kernel/cmake/bbPackage.cxx.in b/kernel/cmake/bbPackage.cxx.in
index 21d47fcb25d4cccaaf96c6421355cc4fbbf4c32a..e64aaad38e910f50ebb1402f1e6ad7e0929b0e1c 100644 (file)
--- a/kernel/cmake/bbPackage.cxx.in
+++ b/kernel/cmake/bbPackage.cxx.in
@@ -1,6 +1,6 @@
 #include "bb@BBTK_PACKAGE_NAME@Package.h"
 
 BBTK_IMPLEMENT_PACKAGE(@BBTK_PACKAGE_NAME@,
-       "@BBTK_PACKAGE_AUTHOR@",
-       "@BBTK_PACKAGE_DESCRIPTION@",
-       "@BBTK_PACKAGE_VERSION@")
+       @BBTK_PACKAGE_AUTHOR@,
+       @BBTK_PACKAGE_DESCRIPTION@,
+       @BBTK_PACKAGE_VERSION@)

diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
index 1afb3f60e9dbc21ecc29a08d3a45651b8da8877a..99133dace43038feb6fed70eff5dfd8ca21f921c 100644 (file)
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/08 07:39:49 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2008/02/08 11:56:10 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -311,8 +311,9 @@ namespace bbtk
     std::string inc = GetScriptFileName();
     if (inc.size()>0) 
       {
-    (s) << "<TR><TD style='vertical-align: top;'><b> To use it </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'> include " 
-      << inc << "</TD></TR>\n";
+       s << "<TR><TD style='vertical-align: top;'><b> To use it </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'> include ";
+       s << inc << "&nbsp;&nbsp;<a href=\"../../../bbs/"<<inc<<"\">[source]</a>";
+       s << "</TD></TR>\n";
        
       }