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

diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
index df133c0..9d144af 100644
--- a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
+++ b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
@@ -2,8 +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_FILE ${BBTK_BBS_BUILD_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"
@@ -32,13 +32,24 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
     CONFIGURE_FILE(
       ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
       ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbs}
-     COPYONLY
-    )
+      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}
+#      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}"
@@ -46,13 +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 ${BBTK_BBS_INSTALL_PATH}
+    DESTINATION ${BBTK_BBS_REL_PATH}
+    )
+ELSE(WIN32)
   INSTALL(
     FILES ${OUTPUT_FILE}
     DESTINATION ${BBTK_BBS_INSTALL_PATH}
+#   DESTINATION ${BBTK_BBS_REL_PATH}
     )
-
-  # Creates the file ${BBTK_PACKAGE_NAME}-appli.bbs
-  SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}-appli.bbs)
+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"
@@ -65,24 +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(
       ${CMAKE_CURRENT_SOURCE_DIR}/${bbs}
       ${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}
+      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}"
@@ -90,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 ${BBTK_BBS_INSTALL_PATH}
+    DESTINATION ${BBTK_BBS_REL_PATH}
+    )
+ELSE(WIN32)  
   INSTALL(
     FILES ${OUTPUT_FILE}
     DESTINATION ${BBTK_BBS_INSTALL_PATH}
+   # DESTINATION ${BBTK_BBS_REL_PATH}
     )
-  
-#  ADD_CUSTOM_TARGET(${BBTK_PACKAGE_NAME}.bbs ALL
+ENDIF(WIN32)  
+#  ADD_CUSTOM_TARGET(${BBTK_PACKAGE_NAME}.bbp ALL
 #    DEPENDS  ${OUTPUT_FILE}
 #    )