X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_doc.cmake;h=bf392a591e912bf4d38973174d5d95403d4542ca;hb=1fd0a4edc8f7e8d5444788662f59c4384a9aab93;hp=f6ff5ae3e5732355ac3cae63517ad0826abf844c;hpb=40b39757a6f9d5056bc08a59081ed19d0406837f;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage_doc.cmake b/kernel/cmake/BBTKConfigurePackage_doc.cmake
index f6ff5ae..bf392a5 100644
--- a/kernel/cmake/BBTKConfigurePackage_doc.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_doc.cmake
@@ -1,28 +1,26 @@
 #---------------------------------------------------------------------------
-# If not a core package 
-# set the build doc option
-# and include necessary cmake scripts
-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
-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)
+IF(BBTK_CORE_PACKAGE)
+  # If a core package set doc options from bbtk global ones
+  IF (BUILD_BBTK_DOC_PACKAGE)
+    SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC ON)
+  ELSE (BUILD_BBTK_DOC_PACKAGE)
+    SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC OFF)
+  ENDIF (BUILD_BBTK_DOC_PACKAGE)
+  IF (BUILD_BBTK_DOC_DOXYGEN)
+    SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC ON)
+  ELSE (BUILD_BBTK_DOC_DOXYGEN)
+    SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC OFF)
+  ENDIF (BUILD_BBTK_DOC_DOXYGEN)
+ELSE(BBTK_CORE_PACKAGE)
+  # If not a core package 
+  # Create the build doc options
+  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)
+  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)
+ENDIF(BBTK_CORE_PACKAGE)
 #---------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
@@ -31,12 +29,10 @@ ENDIF(NOT BBTK_CORE_PACKAGE)
 #----------------------------------------------------------------------------
 # Doxygen
 #----------------------------------------------------------------------------
-IF(BUILD_bbtk_DOC_DOXYGEN) 
-  SET(BBTK_PACKAGE_DOXYGEN_DOC_INSTALL_PATH
-    packages/${BBTK_PACKAGE_NAME}/doxygen
-    )
+IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC)
+  SET(${BBTK_PACKAGE_NAME}_DOXYGEN_REL_PATH ${BBTK_PACKAGE_NAME})
   SUBDIRS(doxygen)
-ENDIF(BUILD_bbtk_DOC_DOXYGEN) 
+ENDIF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC)
 #----------------------------------------------------------------------------
 
 
@@ -44,8 +40,7 @@ ENDIF(BUILD_bbtk_DOC_DOXYGEN)
 #----------------------------------------------------------------------------
 # bbdoc
 #---------------------------------------------------------------------------
-IF(BUILD_bbtk_DOC_PACKAGE) 
+IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
   SUBDIRS(bbdoc)
- #MESSAGE(ERROR "TT")
-ENDIF(BUILD_bbtk_DOC_PACKAGE) 
+ENDIF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
 #---------------------------------------------------------------------------