X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKCreatePackageBBdoc.cmake;h=65670f7ca0c64d10b3447bcf3674c933cd389202;hb=d73a7833a28e6111e1e805efae5df3ab18a240e2;hp=d9d2cbb298655841170bc99f96e06a05bd9472ea;hpb=2159bb535360a4085428c6121099327dd75a7b6e;p=bbtk.git

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index d9d2cbb..65670f7 100644
--- 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})
+  # Creates output dir if it does not exist
+  MKDIR(${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}/${BBTK_PACKAGE_NAME}/appli)
+  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"
@@ -17,20 +17,29 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
     "include ${PACKAGE_NAME}\n"
     "include ${PACKAGE_NAME}-appli\n"
     "#-----------------------------------------\n"
-    "graph ${PACKAGE_NAME} 0 0 ${DOC_OUTPUT} \"none\" \"Package ${PACKAGE_NAME} documentation\"\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
+#    )
 
   ADD_CUSTOM_COMMAND(
     OUTPUT ${DOC_OUTPUT}
     COMMAND 
     #    tth 
-    cd ${BBTK_BIN_PATH} && ${BBTK_BBI} ${OUTPUT_FILE}
+    cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -n ${OUTPUT_FILE}
  #    ARGS
  #   ${OUTPUT_FILE}
   #  DEPENDS ${PACKAGE_NAME}
     )
-  ADD_CUSTOM_TARGET(${PACKAGE_NAME}_index.html ALL
+  ADD_CUSTOM_TARGET(bbdoc_${PACKAGE_NAME} ALL
     DEPENDS ${DOC_OUTPUT}
     )
   # Install