#3120 BBTK Bug New Normal - merge branch changestoITK3and4 FROM master

[bbtk.git] / kernel / cmake / BBTKCreatePackageIncludeScript.cmake

diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
index 29d89ad648498e89a8a889b506df2698a289ffbf..342bbb2502784d51f2fec11446ef0a20a92d5e52 100644 (file)
--- a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
+++ b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
@@ -80,33 +80,39 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
 
 
   ##  --Configure and installing bbs boxes--
-  # --Creates the file ${BBTK_PACKAGE_NAME}.bbp--
-  SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbp)
-  FILE(WRITE 
-    "${OUTPUT_FILE}" 
-    "#-----------------------------------------\n"
-    "# Include script for bbtk package '${BBTK_PACKAGE_NAME}'\n"
-    "# Automatically generated by cmake (macro BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT)\n")
-  FILE(APPEND 
-    "${OUTPUT_FILE}"
-    "#-----------------------------------------\n"
-    "load ${BBTK_PACKAGE_NAME}\n"
-    "#-----------------------------------------\n"
-    "package ${BBTK_PACKAGE_NAME}\n"
-    )
-  
-  #FILE(APPEND 
-  #  "${OUTPUT_FILE}"
-  #  "#-----------------------------------------\n"
-  #  "include ${BBTK_PACKAGE_NAME}/boxes/*\n"
-  #  )
-  
+ 
+
+
+##EED 24/06/2013
+##  FILE(WRITE 
+##    "${OUTPUT_FILE}" 
+##    "#-----------------------------------------\n"
+##    "# Include script for bbtk package '${BBTK_PACKAGE_NAME}'\n"
+##    "# Automatically generated by cmake (macro BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT)\n")
+##  FILE(APPEND 
+##    "${OUTPUT_FILE}"
+##    "#-----------------------------------------\n"
+##    "load ${BBTK_PACKAGE_NAME}\n"
+##    "#-----------------------------------------\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"
-      )
+
+##EED 24/06/2013
+##    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}
@@ -116,42 +122,36 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
     
     
     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)
+      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)
 
 
 
-  ##  --Configure and installing bbs appli--
-  FILE(APPEND 
-    "${OUTPUT_FILE}"
-      "#-----------------------------------------\n"
-      "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}
-    )
-ENDIF(WIN32)
+##EED 24/06/2013
+##  ##  --Configure and installing bbs appli--
+##  FILE(APPEND 
+##    "${OUTPUT_FILE}"
+##      "#-----------------------------------------\n"
+##      "endpackage\n"
+##      "#-- EOF ----------------------------------\n"
+##    )
+
+
+
+
+
   # Creates the file ${BBTK_PACKAGE_NAME}-appli.bbp
   SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}-appli.bbp)
   FILE(WRITE