X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_doc.cmake;h=8b6a5fd9685b717106329abb1d234a71986949ce;hb=d73a7833a28e6111e1e805efae5df3ab18a240e2;hp=56e6e54e3ad929bdbdc66250c326a4678283c81e;hpb=66a3ecd89537e1445311a4298f53b8ba6cf2b0eb;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage_doc.cmake b/kernel/cmake/BBTKConfigurePackage_doc.cmake
index 56e6e54..8b6a5fd 100644
--- a/kernel/cmake/BBTKConfigurePackage_doc.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_doc.cmake
@@ -1,26 +1,18 @@
 #---------------------------------------------------------------------------
 # If not a core package 
-# set the build doc option
-# and include necessary cmake scripts
+# Create the build doc options
 IF(NOT BBTK_CORE_PACKAGE)
-## TO DO 
-# INCLUDE(${BBTK_DIR}/BBTKMacros.cmake)
-# INCLUDE(${BBTK_DIR}/BBTKFindLibraries.cmake)
-# etc.
 OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC 
   "Build the bbtk package ${BBTK_PACKAGE_NAME} html documentation ?" OFF)
 SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
 IF (BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
-  SET(BUILD_bbtk_DOC_BBTK_PACKAGE ON) 
-  # INCLUDE
+  SET(BUILD_bbtk_DOC_PACKAGE ON) 
 ENDIF (BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
-
 OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC 
   "Build the bbtk package ${BBTK_PACKAGE_NAME} doxygen documentation ?" OFF)
 SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC)
 IF (BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC)
   SET(BUILD_bbtk_DOC_DOXYGEN ON) 
-  # INCLUDE
 ENDIF (BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC)
 ENDIF(NOT BBTK_CORE_PACKAGE)
 #---------------------------------------------------------------------------
@@ -28,11 +20,11 @@ ENDIF(NOT BBTK_CORE_PACKAGE)
 #----------------------------------------------------------------------------
 
 
+#----------------------------------------------------------------------------
+# Doxygen
 #----------------------------------------------------------------------------
 IF(BUILD_bbtk_DOC_DOXYGEN) 
-  SET(BBTK_PACKAGE_DOXYGEN_DOC_INSTALL_PATH
-    packages/${BBTK_PACKAGE_NAME}/doxygen
-    )
+  SET(BBTK_PACKAGE_DOXYGEN_REL_PATH ${BBTK_PACKAGE_NAME})
   SUBDIRS(doxygen)
 ENDIF(BUILD_bbtk_DOC_DOXYGEN) 
 #----------------------------------------------------------------------------
@@ -42,58 +34,7 @@ ENDIF(BUILD_bbtk_DOC_DOXYGEN)
 #----------------------------------------------------------------------------
 # bbdoc
 #---------------------------------------------------------------------------
-IF(BUILD_bbtk_DOC_BBTK_PACKAGE) 
-  
-  #    MARK_AS_ADVANCED( bbdoc_PATH )
-  
-  FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/doc/packages)
-  FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/doc/packages/${BBTK_PACKAGE_NAME})
-  
-  
-  IF(WIN32)
-    IF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
-      SET(bbdoc_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/$(IntDir)/bbdoc.exe)
-    ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
-      SET(bbdoc_EXECUTABLE $(SolutionDir)/bin/$(OutDir)/bbdoc.exe)
-    ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
-  ELSE(WIN32)
-    SET(bbdoc_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/bbdoc)
-  ENDIF(WIN32)      
-  
-  # NEVER USE CONFIGURATION FILE BUT ALWAYS BUILD WITH THE JUST COMPILED LIBS 
-  # NOT THE INSTALLED ONES !  
-  #   IF(-bbtk_USE_CONFIGURATION_FILE)
-  # just pass the package name, not the full path name!
-  # and pass the option '1' to bbdoc to use config file
-  #     SET(bbdoc_INPUT ${BBTK_PACKAGE_NAME} 1)    
-  #   ELSE(-bbtk_USE_CONFIGURATION_FILE)
-  
-  
-  
-  IF(WIN32)
-    IF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
-      SET(bbdoc_INPUT ${EXECUTABLE_OUTPUT_PATH}/$(IntDir)/${BBTK_PACKAGE_NAME})
-    ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
-      SET(bbdoc_INPUT $(SolutionDir)/bin/$(OutDir)/${BBTK_PACKAGE_NAME})
-    ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
-  ELSE(WIN32)
-    SET(bbdoc_INPUT ${LIBRARY_OUTPUT_PATH}/${BBTK_PACKAGE_NAME})
-  ENDIF(WIN32)    
-  #   ENDIF(-bbtk_USE_CONFIGURATION_FILE)
-  
-  
-  ADD_CUSTOM_COMMAND(
-    OUTPUT ${PROJECT_BINARY_DIR}/doc/packages/${BBTK_PACKAGE_NAME}/${BBTK_PACKAGE_NAME}.html
-    COMMAND 
-    ${bbdoc_EXECUTABLE} ${bbdoc_INPUT} ${PROJECT_BINARY_DIR}/doc/packages/${BBTK_PACKAGE_NAME}/${BBTK_PACKAGE_NAME}.html
-    DEPENDS 
-    bb${BBTK_PACKAGE_NAME}
-    ${bbdoc_EXECUTABLE}
-    )     
-  
-  ADD_CUSTOM_TARGET(${BBTK_PACKAGE_NAME}.html ALL
-    DEPENDS ${PROJECT_BINARY_DIR}/doc/packages/${BBTK_PACKAGE_NAME}/${BBTK_PACKAGE_NAME}.html)
-  
-ENDIF(BUILD_bbtk_DOC_BBTK_PACKAGE) 
-
-
+IF(BUILD_bbtk_DOC_PACKAGE) 
+  SUBDIRS(bbdoc)
+ENDIF(BUILD_bbtk_DOC_PACKAGE) 
+#---------------------------------------------------------------------------