From d744d34233cd2005b3baa27e7fb5962b5764444e Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Tue, 29 Jan 2008 13:05:28 +0000
Subject: [PATCH] *** empty log message ***

---
 kernel/cmake/BBTKCreatePackageBBdoc.cmake     | 15 ++++++++++---
 .../BBTKCreatePackageIncludeScript.cmake      | 21 ++++++++++++++++---
 kernel/cmake/BBTKMacros.cmake                 | 10 +++++++++
 kernel/cmake/BBTKPaths.cmake                  | 17 +++++----------
 4 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index b0db558..478291e 100644
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -1,9 +1,9 @@
 MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
-
-  FILE(MAKE_DIRECTORY ${BBTK_BBDOC_BUILD_PATH}/${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_BUILD_PATH})
+  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 
@@ -20,6 +20,15 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
     "graph ${PACKAGE_NAME} 0 0 ${DOC_OUTPUT} \"none\" \"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}
diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
index 1bd5c2a..df133c0 100644
--- a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
+++ b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
@@ -16,6 +16,13 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
     "#-----------------------------------------\n"
     "package ${BBTK_PACKAGE_NAME}\n"
     )
+  
+  #FILE(APPEND 
+  #  "${OUTPUT_FILE}"
+  #  "#-----------------------------------------\n"
+  #  "include ${BBTK_PACKAGE_NAME}/boxes/*\n"
+  #  )
+  
   FOREACH(bbs ${BBTK_PACKAGE_BBS_BOXES})  
     FILE(APPEND 
       "${OUTPUT_FILE}"
@@ -27,6 +34,10 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
       ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
      COPYONLY
     )
+    INSTALL(
+      FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
+      DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
+    )
 
   ENDFOREACH(bbs)
   FILE(APPEND 
@@ -63,11 +74,15 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
       "include ${BBTK_PACKAGE_NAME}/${bbs}\n"
       "endefine\n"
       )
-  CONFIGURE_FILE(
+    CONFIGURE_FILE(
       ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
       ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
-     COPYONLY
-    )
+      COPYONLY
+      )
+    INSTALL(
+      FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
+      DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
+      )
   ENDFOREACH(bbs)
   FILE(APPEND 
     "${OUTPUT_FILE}"
diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index 81ce353..b5396fe 100644
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -70,3 +70,13 @@ MACRO(BBTK_DOC_INSTALL_IMAGES DOC_RELATIVE_INSTALL_PATH)
     )  
 ENDMACRO(BBTK_DOC_INSTALL_IMAGES)
 #========================================================================
+
+#========================================================================
+# Creates a directory if it does not exist
+MACRO(MKDIR DIR)
+  IF(NOT IS_DIRECTORY ${DIR})
+    MESSAGE(STATUS "* Creating directory '${DIR}'")
+    FILE(MAKE_DIRECTORY ${DIR})
+  ENDIF(NOT IS_DIRECTORY ${DIR})
+ENDMACRO(MKDIR)
+#========================================================================
diff --git a/kernel/cmake/BBTKPaths.cmake b/kernel/cmake/BBTKPaths.cmake
index 744dd15..97fe461 100644
--- a/kernel/cmake/BBTKPaths.cmake
+++ b/kernel/cmake/BBTKPaths.cmake
@@ -55,18 +55,11 @@ 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})
+MKDIR(${BBTK_DOC_BUILD_PATH})
+MKDIR(${BBTK_BBDOC_BUILD_PATH})
+MKDIR(${BBTK_DOXYGEN_BUILD_PATH})
+MKDIR(${BBTK_DOXYGEN_BUILD_PATH})
+MKDIR(${BBTK_BBS_BUILD_PATH})
 
 #MESSAGE(STATUS "doc='${BBTK_DOC_INSTALL_PATH}'")
 #-----------------------------------------------------------------------------
-- 
2.45.1