X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKCreatePackageIncludeScript.cmake;h=383583fa222fcd8de2cd2aab2ed9527b95c931b2;hb=aefd641287e852b80d22c3cddd8b2025f12cb1d6;hp=3e3dd616dfbf9eaa6ee0060bba936cfecd32da80;hpb=f3c63159608b8929448a81f23adf116eced04fa7;p=bbtk.git

diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
index 3e3dd61..383583f 100644
--- 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"
@@ -17,12 +16,29 @@ 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}"
       "#-----------------------------------------\n"
       "include ${BBTK_PACKAGE_NAME}/${bbs}\n"
       )
+    CONFIGURE_FILE(
+      ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
+      ${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 
     "${OUTPUT_FILE}"
@@ -32,12 +48,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"
@@ -56,9 +71,18 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
       "${OUTPUT_FILE}"
       "#-----------------------------------------\n"
       "define ${filename}\n"
-      "include ${BBTK_PACKAGE_NAME}/${bbs}\n"
+      "include ${BBTK_PACKAGE_NAME}/${bbs} source\n"
       "endefine\n"
       )
+    CONFIGURE_FILE(
+      ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
+      ${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 
     "${OUTPUT_FILE}"
@@ -68,7 +92,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