X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKCreatePackageIncludeScript.cmake;h=9d144af80da6ae9c0508b705057f5993bc7e44d4;hb=ed9d32f344e2ffa223081390b63f064cf1e42de0;hp=26fb8d57a428418bea550280e41ba89a09c162b4;hpb=40b39757a6f9d5056bc08a59081ed19d0406837f;p=bbtk.git

diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
index 26fb8d5..9d144af 100644
--- a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
+++ b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
@@ -2,9 +2,8 @@
 
 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)
+  # Creates the file ${BBTK_PACKAGE_NAME}.bbp
+  SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbp)
   FILE(WRITE 
     "${OUTPUT_FILE}" 
     "#-----------------------------------------\n"
@@ -17,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}"
@@ -25,10 +31,25 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
       )
     CONFIGURE_FILE(
       ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
-      ${PROJECT_BINARY_DIR}/${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
-     COPYONLY
+      ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
+      COPYONLY
+      )
+    GET_FILENAME_COMPONENT(bbs_path ${bbs} PATH)
+    
+    
+    IF(WIN32)
+    INSTALL(
+      FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
+#      DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path}
+      DESTINATION ${BBTK_BBS_REL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path}
     )
-
+ELSE(WIN32)
+INSTALL(
+      FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
+      DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path}
+#      DESTINATION ${BBTK_BBS_REL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path}
+    )
+ENDIF(WIN32)
   ENDFOREACH(bbs)
   FILE(APPEND 
     "${OUTPUT_FILE}"
@@ -36,14 +57,21 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
       "endpackage\n"
       "#-- EOF ----------------------------------\n"
     )
+ IF(WIN32)
   INSTALL(
     FILES ${OUTPUT_FILE}
-    DESTINATION ${OUTPUT_PATH}
+#    DESTINATION ${BBTK_BBS_INSTALL_PATH}
+    DESTINATION ${BBTK_BBS_REL_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)
+ELSE(WIN32)
+  INSTALL(
+    FILES ${OUTPUT_FILE}
+    DESTINATION ${BBTK_BBS_INSTALL_PATH}
+#   DESTINATION ${BBTK_BBS_REL_PATH}
+    )
+ENDIF(WIN32)
+  # Creates the file ${BBTK_PACKAGE_NAME}-appli.bbp
+  SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}-appli.bbp)
   FILE(WRITE 
     "${OUTPUT_FILE}" 
     "#-----------------------------------------\n"
@@ -56,20 +84,38 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
     "#-----------------------------------------\n"
     "package ${BBTK_PACKAGE_NAME}\n"
     )
-  FOREACH(bbs ${BBTK_PACKAGE_BBS_APPLI})  
+  FOREACH(bbs ${BBTK_PACKAGE_BBS_APPLI}) 
+ 
     GET_FILENAME_COMPONENT(filename "${bbs}" NAME_WE) 
     FILE(APPEND 
       "${OUTPUT_FILE}"
       "#-----------------------------------------\n"
       "define ${filename}\n"
-      "include ${BBTK_PACKAGE_NAME}/${bbs}\n"
+      "include ${BBTK_PACKAGE_NAME}/${bbs} source\n"
       "endefine\n"
       )
-  CONFIGURE_FILE(
+      
+    CONFIGURE_FILE(
       ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
-      ${PROJECT_BINARY_DIR}/${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
-     COPYONLY
-    )
+      ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
+      COPYONLY
+      )
+    GET_FILENAME_COMPONENT(bbs_path ${bbs} PATH)
+    
+    
+    IF(WIN32)
+    INSTALL(
+      FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
+  #    DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path}
+      DESTINATION ${BBTK_BBS_REL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path}
+      )
+ELSE(WIN32)
+    INSTALL(
+      FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
+      DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path}
+  #    DESTINATION ${BBTK_BBS_REL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path}
+      )
+ENDIF(WIN32)
   ENDFOREACH(bbs)
   FILE(APPEND 
     "${OUTPUT_FILE}"
@@ -77,12 +123,20 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
       "endpackage\n"
       "#-- EOF ----------------------------------\n"
     )
+IF(WIN32)  
   INSTALL(
     FILES ${OUTPUT_FILE}
-    DESTINATION ${OUTPUT_PATH}
+   # DESTINATION ${BBTK_BBS_INSTALL_PATH}
+    DESTINATION ${BBTK_BBS_REL_PATH}
     )
-  
-#  ADD_CUSTOM_TARGET(${BBTK_PACKAGE_NAME}.bbs ALL
+ELSE(WIN32)  
+  INSTALL(
+    FILES ${OUTPUT_FILE}
+    DESTINATION ${BBTK_BBS_INSTALL_PATH}
+   # DESTINATION ${BBTK_BBS_REL_PATH}
+    )
+ENDIF(WIN32)  
+#  ADD_CUSTOM_TARGET(${BBTK_PACKAGE_NAME}.bbp ALL
 #    DEPENDS  ${OUTPUT_FILE}
 #    )