*** empty log message ***

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index ace6307063bf0bca8d5ab71a384bc8d1a440712f..e3c70b7d34b52bb7a44e16a565d2c7957d791ef9 100644 (file)
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -23,7 +23,7 @@ ENDIF(BUILD_APPLICATIONS)
 IF(UNIX)
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbtk_config_build.xml.in
-    ${BBTK_BIN_PATH}/bbtk_config.xml
+    ${EXECUTABLE_OUTPUT_PATH}/bbtk_config.xml
     @ONLY IMMEDIATE
    )
 ELSE(UNIX)

diff --git a/kernel/bbtk_config_build.xml.in b/kernel/bbtk_config_build.xml.in
index 004d2a4fada2a4058ebd930633c9b16274d7a58b..2a5ff5b4c1b7b9d25b4644f891b0d8661659a9e1 100644 (file)
--- a/kernel/bbtk_config_build.xml.in
+++ b/kernel/bbtk_config_build.xml.in
@@ -2,14 +2,10 @@
 
   <description> Sets the search directories in the build tree </description>
 
-  <bbs_path></bbs_path>
-  <bbs_path>.</bbs_path>
-  <bbs_path> @PROJECT_BINARY_DIR@/@BBTK_BBS_INSTALL_PATH@ </bbs_path>
-  
-  <package_path>@BBTK_BIN_PATH_OUTPUT@ </package_path> 
-
+  <bbs_path> @BBTK_BBS_BUILD_PATH@ </bbs_path>
+  <package_path>.</package_path> 
   <data_path> @BBTK_DATA_ROOT@ </data_path>
 
-  <default_doc_tmp>  @PROJECT_BINARY_DIR@/ </default_doc_tmp>
+  <default_doc_tmp>  @PROJECT_BINARY_DIR@ </default_doc_tmp>
    
 </config>

diff --git a/kernel/cmake/BBTKBuildDoxygenDoc.cmake b/kernel/cmake/BBTKBuildDoxygenDoc.cmake
index 787a1cce3b2a42a0574b1aa07cf322e3ecbaa7fc..0f33ccb6dad685149c588c4c904ff4de67c82071 100644 (file)
--- a/kernel/cmake/BBTKBuildDoxygenDoc.cmake
+++ b/kernel/cmake/BBTKBuildDoxygenDoc.cmake
@@ -12,8 +12,8 @@ MACRO(BBTK_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
   STRING(REGEX REPLACE ";" " " DOXYGEN_INPUT "${INPUT}")
 
   # Output dirs
-  SET(DOXYGEN_HTML_OUTPUT "html")
-  SET(DOXYGEN_OUTPUT ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH})
+  SET(DOXYGEN_HTML_OUTPUT ".")
+  SET(DOXYGEN_OUTPUT ${BBTK_DOXYGEN_BUILD_PATH}/${DOC_RELATIVE_INSTALL_PATH})
   IF(NOT IS_DIRECTORY ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT})
     FILE(MAKE_DIRECTORY ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT})
   ENDIF(NOT IS_DIRECTORY ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT})
@@ -64,7 +64,7 @@ MACRO(BBTK_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
     DIRECTORY
     ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}
     DESTINATION
-    ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}
+    ${BBTK_DOXYGEN_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}
     )
   #--------------------------------------------------------------------------
 

diff --git a/kernel/cmake/BBTKBuildHtmlDocFromLatex.cmake b/kernel/cmake/BBTKBuildHtmlDocFromLatex.cmake
index f1d647ed078515a48518129ebd942561b8bebb6e..66c7c46662cb63eb6b0668dd886acdbfb1aadfd0 100644 (file)
--- a/kernel/cmake/BBTKBuildHtmlDocFromLatex.cmake
+++ b/kernel/cmake/BBTKBuildHtmlDocFromLatex.cmake
@@ -1,27 +1,29 @@
 
 
-MACRO(BBTK_BUILD_HTML_DOC_FROM_LATEX TEX_FILE)
+MACRO(BBTK_BUILD_HTML_DOC_FROM_LATEX TEX_FILE OUTPUT_REL_PATH)
+  # Need tth
   SET(USE_TTH ON CACHE BOOL "" FORCE)
-  
+  # Construct absolute build path
+  SET(BUILD_PATH ${BBTK_DOC_BUILD_PATH}/${OUTPUT_REL_PATH})
   #-------------------------------------------------------------------------
   ##  MESSAGE(STATUS ${LATEX_tth_CONVERTER})
   
   ADD_CUSTOM_COMMAND(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.html
+    OUTPUT ${BUILD_PATH}/${TEX_FILE}.html
     COMMAND 
     #    tth 
     ${LATEX_tth_CONVERTER}
     ARGS
-    -e2 ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.tex 2>tth.log
+    -e2 ${BUILD_PATH}/${TEX_FILE}.tex 2>tth.log
  #   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.pdf
     )
   ADD_CUSTOM_TARGET(${TEX_FILE}.html ALL
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.html
+    DEPENDS ${BUILD_PATH}/${TEX_FILE}.html
     )
   # Install
   INSTALL( 
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.html
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_INSTALL_PATH}/${TEX_FILE}
+    FILES ${BUILD_PATH}/${TEX_FILE}.html
+    DESTINATION ${BBTK_DOC_INSTALL_PATH}/${OUTPUT_REL_PATH}
     )   
   #-------------------------------------------------------------------------
   

diff --git a/kernel/cmake/BBTKBuildLatexDoc.cmake b/kernel/cmake/BBTKBuildLatexDoc.cmake
index 1bd7644d17527e509c7e405be720286542871179..102a7e7b2b70f926dfea738e36da00761d42d6ce 100644 (file)
--- a/kernel/cmake/BBTKBuildLatexDoc.cmake
+++ b/kernel/cmake/BBTKBuildLatexDoc.cmake
@@ -1,54 +1,56 @@
 
 
-MACRO(BBTK_BUILD_LATEX_DOC TEX_FILE)
-  
+MACRO(BBTK_BUILD_LATEX_DOC TEX_FILE OUTPUT_REL_PATH)
+  # Need LaTeX
   SET(USE_LATEX ON CACHE BOOL "" FORCE)
-
+  # Construct absolute build path
+  SET(BUILD_PATH ${BBTK_DOC_BUILD_PATH}/${OUTPUT_REL_PATH})
   #MESSAGE(STATUS "Tex file : ${TEX_FILE}")
   #---------------------------------------------------------------------------
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/${TEX_FILE}.tex
-    ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.tex
+    ${BUILD_PATH}/${TEX_FILE}.tex
     COPYONLY
     )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/../config.tex
-    ${CMAKE_CURRENT_BINARY_DIR}/config.tex
+    ${BUILD_PATH}/config.tex
     COPYONLY
     )
   #---------------------------------------------------------------------------
   
   # Have to run latex twice to get references, toc, etc.
   ADD_CUSTOM_COMMAND(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.aux 
+    OUTPUT ${BUILD_PATH}/${TEX_FILE}.aux 
     COMMAND 
     # latex
-    ${LATEX_COMPILER}
+    cd ${BUILD_PATH} && ${LATEX_COMPILER}
     ARGS
-    -interaction=batchmode ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE} -output-directory=${CMAKE_CURRENT_BINARY_DIR}/
+    -interaction=batchmode ${BUILD_PATH}/${TEX_FILE} -output-directory=${BUILD_PATH}/
     
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.tex 
-    ${CMAKE_CURRENT_BINARY_DIR}/config.tex 
+    DEPENDS 
+    ${CMAKE_CURRENT_SOURCE_DIR}/${TEX_FILE}.tex
+    ${CMAKE_CURRENT_SOURCE_DIR}/../config.tex
     )
   ADD_CUSTOM_COMMAND(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.pdf
+    OUTPUT ${BUILD_PATH}/${TEX_FILE}.pdf
     COMMAND 
     # latex
-    ${LATEX_COMPILER}
+    cd ${BUILD_PATH} && ${LATEX_COMPILER}
     ARGS
-    -interaction=batchmode ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE} -output-directory=${CMAKE_CURRENT_BINARY_DIR}/
-    
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.aux 
+    -interaction=batchmode ${BUILD_PATH}/${TEX_FILE} -output-directory=${BUILD_PATH}/
+  
+    DEPENDS ${BUILD_PATH}/${TEX_FILE}.aux 
     )
   
   # pdf target
   ADD_CUSTOM_TARGET(${TEX_FILE}.pdf ALL
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.pdf)
+    DEPENDS ${BUILD_PATH}/${TEX_FILE}.pdf)
 
   # Install
   INSTALL( 
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.pdf
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_INSTALL_PATH}/${TEX_FILE}
+    FILES ${BUILD_PATH}/${TEX_FILE}.pdf
+    DESTINATION ${BBTK_DOC_INSTALL_PATH}/${OUTPUT_REL_PATH}
     )  
 
 

diff --git a/kernel/cmake/BBTKConfigurePackage_doc.cmake b/kernel/cmake/BBTKConfigurePackage_doc.cmake
index 356faab58e744cd7ac2ebc15c21e73e2f28f8f6e..cb5d55ff9c6ed159265f2f7ac9d0ab60040d87a2 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_doc.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_doc.cmake
@@ -32,8 +32,8 @@ ENDIF(NOT BBTK_CORE_PACKAGE)
 # Doxygen
 #----------------------------------------------------------------------------
 IF(BUILD_bbtk_DOC_DOXYGEN) 
-  SET(BBTK_PACKAGE_DOXYGEN_DOC_INSTALL_PATH
-    packages/doxygen/${BBTK_PACKAGE_NAME}
+  SET(BBTK_PACKAGE_DOXYGEN_REL_PATH
+    ${BBTK_PACKAGE_NAME}
     )
   SUBDIRS(doxygen)
 ENDIF(BUILD_bbtk_DOC_DOXYGEN) 

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index d9d2cbb298655841170bc99f96e06a05bd9472ea..b0db55886d765fb3b795d217735949f765136fda 100644 (file)
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -1,11 +1,11 @@
 MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
 
-  FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/packages/bbdoc/${PACKAGE_NAME})
+  FILE(MAKE_DIRECTORY ${BBTK_BBDOC_BUILD_PATH}/${PACKAGE_NAME})
 
   # Create file make_doc_${PACKAGE_NAME}.bbs
-  SET(OUTPUT_PATH ${BBTK_BBS_INSTALL_PATH})
-  SET(OUTPUT_FILE ${PROJECT_BINARY_DIR}/${OUTPUT_PATH}/make_doc_${PACKAGE_NAME}.bbs)
-  SET(DOC_OUTPUT ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/packages/bbdoc/${PACKAGE_NAME}/index.html)
+  SET(OUTPUT_PATH ${BBTK_BBS_BUILD_PATH})
+  SET(OUTPUT_FILE ${OUTPUT_PATH}/make_doc_${PACKAGE_NAME}.bbs)
+  SET(DOC_OUTPUT ${BBTK_BBDOC_BUILD_PATH}/${PACKAGE_NAME}/index.html)
   FILE(WRITE 
     "${OUTPUT_FILE}" 
     "#-----------------------------------------\n"
@@ -30,7 +30,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
  #   ${OUTPUT_FILE}
   #  DEPENDS ${PACKAGE_NAME}
     )
-  ADD_CUSTOM_TARGET(${PACKAGE_NAME}_index.html ALL
+  ADD_CUSTOM_TARGET(bbdoc_${PACKAGE_NAME} ALL
     DEPENDS ${DOC_OUTPUT}
     )
   # Install

diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
index 26fb8d57a428418bea550280e41ba89a09c162b4..1bd5c2a8f525c857bde4b4ddd13c61ddd0cbf4c2 100644 (file)
--- a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
+++ b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
@@ -3,8 +3,7 @@
 MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BBS_BOXES    BBTK_PACKAGE_BBS_APPLI )
 
   # Creates the file ${BBTK_PACKAGE_NAME}.bbs
-  SET(OUTPUT_PATH ${BBTK_BBS_INSTALL_PATH})
-  SET(OUTPUT_FILE ${PROJECT_BINARY_DIR}/${OUTPUT_PATH}/${BBTK_PACKAGE_NAME}.bbs)
+  SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbs)
   FILE(WRITE 
     "${OUTPUT_FILE}" 
     "#-----------------------------------------\n"
@@ -25,7 +24,7 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
       )
     CONFIGURE_FILE(
       ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
-      ${PROJECT_BINARY_DIR}/${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
+      ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
      COPYONLY
     )
 
@@ -38,12 +37,11 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
     )
   INSTALL(
     FILES ${OUTPUT_FILE}
-    DESTINATION ${OUTPUT_PATH}
+    DESTINATION ${BBTK_BBS_INSTALL_PATH}
     )
 
   # Creates the file ${BBTK_PACKAGE_NAME}-appli.bbs
-  SET(OUTPUT_PATH ${BBTK_BBS_INSTALL_PATH})
-  SET(OUTPUT_FILE ${PROJECT_BINARY_DIR}/${OUTPUT_PATH}/${BBTK_PACKAGE_NAME}-appli.bbs)
+  SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}-appli.bbs)
   FILE(WRITE 
     "${OUTPUT_FILE}" 
     "#-----------------------------------------\n"
@@ -67,7 +65,7 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
       )
   CONFIGURE_FILE(
       ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
-      ${PROJECT_BINARY_DIR}/${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
+      ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
      COPYONLY
     )
   ENDFOREACH(bbs)
@@ -79,7 +77,7 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
     )
   INSTALL(
     FILES ${OUTPUT_FILE}
-    DESTINATION ${OUTPUT_PATH}
+    DESTINATION ${BBTK_BBS_INSTALL_PATH}
     )
   
 #  ADD_CUSTOM_TARGET(${BBTK_PACKAGE_NAME}.bbs ALL

diff --git a/kernel/cmake/BBTKFindGTK2.cmake b/kernel/cmake/BBTKFindGTK2.cmake
index 1ee6a7494f53ea3ca77e01f812bfbce39def0f0b..dcd23fe2b920358c32181a08f01a9961eb372db9 100644 (file)
--- a/kernel/cmake/BBTKFindGTK2.cmake
+++ b/kernel/cmake/BBTKFindGTK2.cmake
@@ -296,7 +296,7 @@ ELSE (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS)
 
     IF (GTK2_FOUND)
       IF (NOT GTK2_FIND_QUIETLY)
-        MESSAGE(STATUS "Found GTK2: ${GTK2_LIBRARIES}")
+        MESSAGE(STATUS "Looking for gtk2... - found ${GTK2_LIBRARIES}")
       ENDIF (NOT GTK2_FIND_QUIETLY)
     ELSE (GTK2_FOUND)
       IF (GTK2_FIND_REQUIRED)

diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index 0f832e5ef07d19cb82950a91151d73b7534e30d1..81ce353a899cc0f99ba3092bfcffbd3328c0498a 100644 (file)
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -39,9 +39,9 @@ ENDMACRO(ADD_DEF_WITH_VAL)
 # FROM SOURCE TREE TO DOC BUILD TREE
 # AND INSTALL THEM IN BBTK DOC TREE
 MACRO(BBTK_DOC_INSTALL_IMAGES DOC_RELATIVE_INSTALL_PATH)
-  FILE(GLOB PNG_IMAGES "." "*.png")
-  FILE(GLOB JPG_IMAGES "." "*.jpg")
-  FILE(GLOB TIF_IMAGES "." "*.tif")
+  FILE(GLOB PNG_IMAGES "*.png")
+  FILE(GLOB JPG_IMAGES "*.jpg")
+  FILE(GLOB TIF_IMAGES "*.tif")
   SET(IMAGES
     ${PNG_IMAGES}
     ${JPG_IMAGES}
@@ -52,21 +52,21 @@ MACRO(BBTK_DOC_INSTALL_IMAGES DOC_RELATIVE_INSTALL_PATH)
     GET_FILENAME_COMPONENT(filename "${image}" NAME)
     CONFIGURE_FILE(
       ${image}
-       ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}/${filename}
+       ${BBTK_DOC_BUILD_PATH}/${DOC_RELATIVE_INSTALL_PATH}/${filename}
       COPYONLY
       ) 
-      IF (WIN32)
-       CONFIGURE_FILE(
-          ${image}
-          ${CMAKE_CURRENT_BINARY_DIR}/${filename}
-          COPYONLY
-         )
-      ENDIF(WIN32)
+    #  IF (WIN32)
+#      CONFIGURE_FILE(
+#          ${image}
+#          ${CMAKE_CURRENT_BINARY_DIR}/${filename}
+#          COPYONLY
+#        )
+#      ENDIF(WIN32)
     # MESSAGE(ERROR "${image} (${filename}) in :  ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}/${filename}")
   ENDFOREACH(image)
   INSTALL( 
       FILES ${IMAGES} 
-      DESTINATION ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}
+      DESTINATION ${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}
     )  
 ENDMACRO(BBTK_DOC_INSTALL_IMAGES)
 #========================================================================

diff --git a/kernel/cmake/BBTKPaths.cmake b/kernel/cmake/BBTKPaths.cmake
index f574194c8993694a89c8712a866b98fb55b7d82d..744dd15697f44883e703e964e53fa572ad202f49 100644 (file)
--- a/kernel/cmake/BBTKPaths.cmake
+++ b/kernel/cmake/BBTKPaths.cmake
@@ -23,20 +23,50 @@ ENDIF(WIN32)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-# The vars BBTK_DOC_INSTALL_PATH and BBTK_BBS_INSTALL_PATH
-# store documentation and scripts install paths 
+# The vars BBTK_DOC_REL_PATH and BBTK_BBS_REL_PATH
+# store documentation and scripts **RELATIVE** paths  
+# from build tree root or install tree root
 # (different on win/lin)
 IF(WIN32)
-  SET(BBTK_DOC_INSTALL_PATH doc)
-  SET(BBTK_BBS_INSTALL_PATH bbs)
+  SET(BBTK_DOC_REL_PATH doc)
+  SET(BBTK_BBS_REL_PATH bbs)
 ELSE(WIN32)
-  SET(BBTK_SHARE_INSTALL_PATH share/bbtk)
-  SET(BBTK_DOC_INSTALL_PATH share/bbtk/doc)
-  SET(BBTK_BBS_INSTALL_PATH share/bbtk/bbs)
+  SET(BBTK_SHARE_REL_PATH share/bbtk)
+  SET(BBTK_DOC_REL_PATH share/bbtk/doc)
+  SET(BBTK_BBS_REL_PATH share/bbtk/bbs)
 ENDIF(WIN32)   
+# Set C preprocessor definitions
+ADD_DEF_WITH_VAL(BBTK_DOC_REL_PATH ${BBTK_DOC_REL_PATH})
+ADD_DEF_WITH_VAL(BBTK_BBS_REL_PATH ${BBTK_BBS_REL_PATH})
+# Black box docs relative path
+SET(BBTK_BBDOC_REL_PATH ${BBTK_DOC_REL_PATH}/bbdoc)
+# Doxygen docs relative path
+SET(BBTK_DOXYGEN_REL_PATH ${BBTK_DOC_REL_PATH}/doxygen)
 
-ADD_DEF_WITH_VAL(BBTK_DOC_REL_PATH ${BBTK_DOC_INSTALL_PATH})
-ADD_DEF_WITH_VAL(BBTK_BBS_REL_PATH ${BBTK_BBS_INSTALL_PATH})
+# Now compute BUILD TREE and INSTALL TREE **ABSOLUTE PATHS**
+SET(BBTK_DOC_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DOC_REL_PATH})
+SET(BBTK_BBDOC_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBDOC_REL_PATH})
+SET(BBTK_DOXYGEN_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DOXYGEN_REL_PATH})
+SET(BBTK_BBS_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBS_REL_PATH})
 
-MESSAGE(STATUS "doc='${BBTK_DOC_INSTALL_PATH}'")
+SET(BBTK_DOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_REL_PATH})
+SET(BBTK_BBDOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_BBDOC_REL_PATH})
+SET(BBTK_DOXYGEN_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DOXYGEN_REL_PATH})
+SET(BBTK_BBS_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_BBS_REL_PATH})
+
+# Create build directories if necessary
+IF(NOT IS_DIRECTORY ${BBTK_DOC_BUILD_PATH})
+  FILE(MAKE_DIRECTORY ${BBTK_DOC_BUILD_PATH})
+ENDIF(NOT IS_DIRECTORY ${BBTK_DOC_BUILD_PATH})
+IF(NOT IS_DIRECTORY ${BBTK_BBDOC_BUILD_PATH})
+  FILE(MAKE_DIRECTORY ${BBTK_BBDOC_BUILD_PATH})
+ENDIF(NOT IS_DIRECTORY ${BBTK_BBDOC_BUILD_PATH})
+IF(NOT IS_DIRECTORY ${BBTK_DOXYGEN_BUILD_PATH})
+  FILE(MAKE_DIRECTORY ${BBTK_DOXYGEN_BUILD_PATH})
+ENDIF(NOT IS_DIRECTORY ${BBTK_DOXYGEN_BUILD_PATH})
+IF(NOT IS_DIRECTORY ${BBTK_BBS_BUILD_PATH})
+  FILE(MAKE_DIRECTORY ${BBTK_BBS_BUILD_PATH})
+ENDIF(NOT IS_DIRECTORY ${BBTK_BBS_BUILD_PATH})
+
+#MESSAGE(STATUS "doc='${BBTK_DOC_INSTALL_PATH}'")
 #-----------------------------------------------------------------------------

diff --git a/kernel/doc/CMakeLists.txt b/kernel/doc/CMakeLists.txt
index 73e04d546c40cdd97c2702c71bc0aa6763519404..04ae605b9f11a2c0e223ea6fff1ac3ec8a59be83 100755 (executable)
--- a/kernel/doc/CMakeLists.txt
+++ b/kernel/doc/CMakeLists.txt
@@ -1,16 +1,4 @@
 
-#-----------------------------------------------------------------------------
-IF(UNIX)
-  # Make symbolic links to get doc links work in build tree
-  IF(NOT IS_DIRECTORY ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH})
-    FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${BBTK_SHARE_INSTALL_PATH})
-    EXECUTE_PROCESS(
-      COMMAND ln -s ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH})
-#    EXECUTE_PROCESS(
-#      COMMAND ln -s ${CMAKE_CURRENT_BINARY_DIR}/.. ${PROJECT_BINARY_DIR}/${BBTK_BBS_INSTALL_PATH})
-  ENDIF(NOT IS_DIRECTORY ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH})
-ENDIF(UNIX)
-#-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 OPTION(BUILD_bbtk_DOC "Build documentation for bbtk." OFF)
@@ -22,7 +10,7 @@ SWITCH_ON_IF_BUILD_ALL(BUILD_bbtk_DOC)
 IF(BUILD_bbtk_DOC)
   
   OPTION(BUILD_bbtk_DOC_PACKAGE 
-    "Build bbtk packages documentation (bbi)."          ON)
+    "Build bbtk packages documentation (bbi+dot)."      ON)
   OPTION(BUILD_bbtk_DOC_DOXYGEN 
     "Build doxygen documentation (doxygen)."            ON)
   OPTION(BUILD_bbtk_DOC_GUIDES_PDF 
@@ -34,7 +22,7 @@ ELSE(BUILD_bbtk_DOC)
   
   IF(BUILD_bbtk_DOC_PACKAGE)
     SET(BUILD_bbtk_DOC_PACKAGE OFF CACHE BOOL 
-      "Build bbtk packages documentation (bbdoc)."     FORCE)
+      "Build bbtk packages documentation (bbdoc+dot)." FORCE)
   ENDIF(BUILD_bbtk_DOC_PACKAGE)
   IF(BUILD_bbtk_DOC_DOXYGEN)
     SET(BUILD_bbtk_DOC_DOXYGEN OFF CACHE BOOL 
@@ -59,7 +47,6 @@ ENDIF(BUILD_bbtk_DOC)
 
 
 #-----------------------------------------------------------------------------
-
 IF(BUILD_bbtk_DOC AND BUILD_bbtk_DOC_DOXYGEN)
   INCLUDE(../cmake/BBTKBuildDoxygenDoc.cmake)
   SUBDIRS(bbtkDoxygen)
@@ -96,36 +83,28 @@ IF(BUILD_bbtk_DOC AND BUILD_bbtk_DOC_GUIDES_PDF OR BUILD_bbtk_DOC_GUIDES_HTML)
 ENDIF(BUILD_bbtk_DOC AND BUILD_bbtk_DOC_GUIDES_PDF OR BUILD_bbtk_DOC_GUIDES_HTML)
 #-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-#IF(BUILD_bbtk_DOC AND BUILD_bbtk_DOC_SCRIPTS) 
-#  SUBDIRS(scripts)
-#ENDIF(BUILD_bbtk_DOC AND BUILD_bbtk_DOC_SCRIPTS) 
-#-----------------------------------------------------------------------------
-
 
 #-----------------------------------------------------------------------------
-# Web site
+# Web site 
 IF(BUILD_bbtk_DOC)
-  # Configure doc index.html for build tree doc
+  # Configure main page index.html for build tree
   CONFIGURE_FILE(
     index.html
-    ${CMAKE_CURRENT_BINARY_DIR}/index.html
+    ${BBTK_DOC_BUILD_PATH}/index.html
     @ONLY
     )
-  # Install
+  # Install it 
   INSTALL( 
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/index.html 
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_INSTALL_PATH}
-    )  
+    FILES ${BBTK_DOC_BUILD_PATH}/index.html 
+    DESTINATION ${BBTK_DOC_INSTALL_PATH}
+    ) 
+  # Recurse it bbtkWebSite dir
   SUBDIRS(bbtkWebSite)
-  INSTALL(
-    DIRECTORY  ${BBTK_BINARY_DIR}/kernel/doc 
-    DESTINATION  ${CMAKE_INSTALL_PREFIX}
-    )
+
+#  INSTALL(
+#    DIRECTORY  ${BBTK_BINARY_DIR}/kernel/doc 
+#    DESTINATION  ${CMAKE_INSTALL_PREFIX}
+#    )
 ENDIF(BUILD_bbtk_DOC)
 #-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-# Creates the packages subdir
-#FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/packages)
-#-----------------------------------------------------------------------------

diff --git a/kernel/doc/bbtkDevelopersGuide/CMakeLists.txt b/kernel/doc/bbtkDevelopersGuide/CMakeLists.txt
index 61cbc10acb8afbfdb2637ecef427a0b2fdd6c0fe..d160a2c8ad8f6be969a8e736cdf89521aec5f413 100755 (executable)
--- a/kernel/doc/bbtkDevelopersGuide/CMakeLists.txt
+++ b/kernel/doc/bbtkDevelopersGuide/CMakeLists.txt
@@ -1,3 +1,3 @@
 BBTK_DOC_INSTALL_IMAGES(bbtkDevelopersGuide)
-BBTK_BUILD_LATEX_DOC(bbtkDevelopersGuide)
-BBTK_BUILD_HTML_DOC_FROM_LATEX(bbtkDevelopersGuide)
+BBTK_BUILD_LATEX_DOC(bbtkDevelopersGuide bbtkDevelopersGuide)
+BBTK_BUILD_HTML_DOC_FROM_LATEX(bbtkDevelopersGuide bbtkDevelopersGuide)

diff --git a/kernel/doc/bbtkDoxygen/CMakeLists.txt b/kernel/doc/bbtkDoxygen/CMakeLists.txt
index d50d4326fb4a6b2e685bc32f4c403710be88a40b..bfb53d5a4662f0f2b2c86598bddf3b2c7afca88f 100755 (executable)
--- a/kernel/doc/bbtkDoxygen/CMakeLists.txt
+++ b/kernel/doc/bbtkDoxygen/CMakeLists.txt
@@ -20,7 +20,7 @@ INCLUDE(${BBTK_DIR}/BBTKBuildDoxygenDoc.cmake)
 BBTK_BUILD_DOXYGEN_DOC(
   "BBTK" 
   "${INPUT}" 
-  "bbtkDoxygen" 
+  "bbtk" 
   "${DOXYGEN_DOC_PREDEFINED}"
   )
 

diff --git a/kernel/doc/bbtkPackageDevelopersGuide/CMakeLists.txt b/kernel/doc/bbtkPackageDevelopersGuide/CMakeLists.txt
index 78998d9d730b92bc2caedb650f88a527be923737..80dc628c19c9bb3aeb7b5106bf4d436ef672da51 100755 (executable)
--- a/kernel/doc/bbtkPackageDevelopersGuide/CMakeLists.txt
+++ b/kernel/doc/bbtkPackageDevelopersGuide/CMakeLists.txt
@@ -1,3 +1,3 @@
 BBTK_DOC_INSTALL_IMAGES(bbtkPackageDevelopersGuide)
-BBTK_BUILD_LATEX_DOC(bbtkPackageDevelopersGuide)
-BBTK_BUILD_HTML_DOC_FROM_LATEX(bbtkPackageDevelopersGuide)
+BBTK_BUILD_LATEX_DOC(bbtkPackageDevelopersGuide bbtkPackageDevelopersGuide)
+BBTK_BUILD_HTML_DOC_FROM_LATEX(bbtkPackageDevelopersGuide bbtkPackageDevelopersGuide)

diff --git a/kernel/doc/bbtkUsersGuide/CMakeLists.txt b/kernel/doc/bbtkUsersGuide/CMakeLists.txt
index 8aae893577911ba3f24b8b2efc09f21c7ffa4688..4f0c134e04b1a6e5584ea2ebb71e16d9cd1b786a 100755 (executable)
--- a/kernel/doc/bbtkUsersGuide/CMakeLists.txt
+++ b/kernel/doc/bbtkUsersGuide/CMakeLists.txt
@@ -1,3 +1,3 @@
 BBTK_DOC_INSTALL_IMAGES(bbtkUsersGuide)
-BBTK_BUILD_LATEX_DOC(bbtkUsersGuide)
-BBTK_BUILD_HTML_DOC_FROM_LATEX(bbtkUsersGuide)
+BBTK_BUILD_LATEX_DOC(bbtkUsersGuide bbtkUsersGuide)
+BBTK_BUILD_HTML_DOC_FROM_LATEX(bbtkUsersGuide bbtkUsersGuide)

diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt
index dd6bb900718ef4df7a906e62ac9eba99b79b63b0..578995d10834aaa609dd44b459d3c1b50b42110a 100644 (file)
--- a/kernel/doc/bbtkWebSite/CMakeLists.txt
+++ b/kernel/doc/bbtkWebSite/CMakeLists.txt
@@ -17,13 +17,13 @@ FOREACH(page ${HTML_PAGES})
   GET_FILENAME_COMPONENT(filename "${page}" NAME)
   CONFIGURE_FILE(
     ${page}
-    ${CMAKE_CURRENT_BINARY_DIR}/${filename}
+    ${BBTK_DOC_BUILD_PATH}/bbtkWebSite/${filename}
     @ONLY
     )
   # Install
   INSTALL(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/${filename}
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_INSTALL_PATH}/bbtkWebSite
+    FILES ${BBTK_DOC_BUILD_PATH}/bbtkWebSite/${filename}
+    DESTINATION ${BBTK_DOC_INSTALL_PATH}/bbtkWebSite
     )
 ENDFOREACH(page)
 

diff --git a/kernel/doc/bbtkWebSite/menu.html b/kernel/doc/bbtkWebSite/menu.html
index d4b6981a77358302bcb8038086542fdac9689ab7..dd8e0ac2541dada04c8f3d92e97de0a55b54d510 100644 (file)
--- a/kernel/doc/bbtkWebSite/menu.html
+++ b/kernel/doc/bbtkWebSite/menu.html
@@ -38,62 +38,47 @@ Guide</a> (<font size="2"><small><small><a
  target="information">pdf</a></small></small></font>)<br>
 Reference (pdf)<br>
 </small></font></small><small><font size="3"><small> <a
- href="../bbtkDoxygen/html/index.html" target="information">Doxygen doc</a></small></font></small>
+ href="../doxygen/bbtk/index.html" target="information">Doxygen doc</a></small></font></small>
 <ul>
 </ul>
-<hr style="width: 100%; height: 2px;">Packages doc<small><br>
+<hr style="width: 100%; height: 2px;">Packages<small><br>
 </small>
 <blockquote><small> </small></blockquote>
 <small><b>itk :<big> </big></b></small><font size="2"><a
- href="../packages/itk/bbdoc/index.html" target="information">bbdoc</a></font>
-- <font size="2"><a href="../packages/itk/doxygen/index.html"
+ href="../packages/bbdoc/itk/index.html" target="information">bbdoc</a></font>
+- <font size="2"><a href="../packages/doxygen/itk/index.html"
  target="information">doxygen</a></font> <br>
 <small><b> itkvtk : </b></small><font size="2"><a
- href="../packages/itkvtk/bbdoc/index.html" target="information">bbdoc</a></font>
-- <font size="2"><a href="../packages/itkvtk/doxygen/index.html"
+ href="../packages/bbdoc/itkvtk/index.html" target="information">bbdoc</a></font>
+- <font size="2"><a href="../packages/docygen/itkvtk/index.html"
  target="information">doxygen</a></font><br>
 <small><b> std : </b></small><span style="text-decoration: underline;"></span><font
- size="2"><a href="../packages/std/bbdoc/index.html"
+ size="2"><a href="../packages/bbdoc/std/index.html"
  target="information">bbdoc</a></font>
-- <font size="2"><a href="../packages/std/doxygen/index.html"
+- <font size="2"><a href="../packages/doxygen/std/index.html"
  target="information">doxygen</a></font><br>
 <small><b> vtk : </b></small><font size="2"><a
- href="../packages/vtk/bbdoc/index.html" target="information">bbdoc</a></font>
-- <font size="2"><a href="../packages/vtk/doxygen/index.html"
+ href="../packages/bbdoc/vtk/index.html" target="information">bbdoc</a></font>
+- <font size="2"><a href="../packages/doxygen/vtk/index.html"
  target="information">doxygen</a></font><br>
 <small><b> wx : </b></small><font size="2"><a
- href="../packages/bbdoc/wx/index.html" target="information">bbdoc</a></font>
-- <font size="2"><a href="../packages/doxygen/wx/html/index.html"
+ href="../bbdoc/wx/index.html" target="information">bbdoc</a></font>
+- <font size="2"><a href="../doxygen/wx/index.html"
  target="information">doxygen</a></font><br>
 <small><b> wxvtk : </b></small><font size="2"><a
- href="../packages/wxvtk/bbdoc/index.html" target="information">bbdoc</a></font>
-- <font size="2"><a href="../packages/wxvtk/doxygen/index.html"
+ href="../packages/bbdoc/wxvtk/index.html" target="information">bbdoc</a></font>
+- <font size="2"><a href="../packages/doxygen/wxvtk/index.html"
  target="information">doxygen</a><br>
 <br>
 <span style="font-weight: bold;">browse packages </span></font><font
  size="2"><a href="../packages/" target="information">folder</a></font>
 <ul>
 </ul>
-<hr style="width: 100%; height: 2px;">Scripts doc<br>
-<br>
-<small><a target="information" href="../scripts/bbtk/demo/index.html">scripts/demo</a></small><br>
-<small><a target="information" href="../scripts/bbtk/boxes/index.html">scripts/boxes</a></small><br>
-<small><a target="information"
- href="../scripts/bbtk/utilities/index.html">scripts/utilities</a></small><br>
-<small><a target="information" href="../scripts/bbtk/test/index.html">scripts/test</a><br>
+<hr style="width: 100%; height: 2px;"><small>
 </small>
 <ul>
 </ul>
 <blockquote><big> </big></blockquote>
-<p><font size="2"><span style="font-weight: bold;">browse scripts </span></font><font
- size="2"><a href="../../scripts/" target="information">folder</a><br>
-</font></p>
-<p><font size="2"><span style="font-weight: bold;">browse scripts doc </span></font><font
- size="2"><a href="../scripts/" target="information">folder</a></font>
-</p>
-<hr style="width: 100%; height: 2px;">
-<p><br>
-</p>
-<p>&nbsp;</p>
+&nbsp;
 </body>
 </html>

diff --git a/packages/wx/doc/doxygen/CMakeLists.txt b/packages/wx/doc/doxygen/CMakeLists.txt
index ba9b1f18daf68f508038974b2e32edd0c2f79968..531397dff643e94e0248258df37bac0a42b1f850 100644 (file)
--- a/packages/wx/doc/doxygen/CMakeLists.txt
+++ b/packages/wx/doc/doxygen/CMakeLists.txt
@@ -16,7 +16,7 @@ INCLUDE(${BBTK_DIR}/BBTKBuildDoxygenDoc.cmake)
 BBTK_BUILD_DOXYGEN_DOC(
   "${BBTK_PACKAGE_NAME}" 
   "${INPUT}" 
-  "${BBTK_PACKAGE_DOXYGEN_DOC_INSTALL_PATH}"
+  "${BBTK_PACKAGE_DOXYGEN_REL_PATH}"
   "${DOXYGEN_DOC_PREDEFINED}"
   )