X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2FbbCreatePackage%2FCMakeLists.txt;h=cdadec68a5597672d5de6139d707b5b9e8525185;hb=98d1e0eb1df1829dc7fc7e67f5b516e2b75d2730;hp=15ef429567fabd44ac3c56e3d4e5093faa7b3475;hpb=42b2c2a160b8889c869e208b6936e1b641e6185f;p=bbtk.git

diff --git a/kernel/appli/bbCreatePackage/CMakeLists.txt b/kernel/appli/bbCreatePackage/CMakeLists.txt
index 15ef429..cdadec6 100644
--- a/kernel/appli/bbCreatePackage/CMakeLists.txt
+++ b/kernel/appli/bbCreatePackage/CMakeLists.txt
@@ -10,28 +10,41 @@
 
 
 
-# Empty package structure
+
+
+# Relative path to the data used by bbCreatePackage from data root folder
+SET(bbCreatePackage_DATA_REL_PATH_FROM_DATA kernel/bbCreatePackage)
+
+# Configure / Install the empty package structure used by bbCreatePackage
+# Copy it into build tree
 FILE(GLOB_RECURSE LST_FILE_VOID_CREATE_PACKAGE RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/void-Package *.txt *.in *.cmake )
 FOREACH( iLST  ${LST_FILE_VOID_CREATE_PACKAGE})
      STRING(SUBSTRING ${iLST} 0 3 subStrTmp )
   IF( ${subStrTmp} STREQUAL "../" )
       	# ...
   ELSE( ${subStrTmp} STREQUAL "../" )
-    IF(WIN32)
-	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/void-Package/${iLST} ${BBTK_BINARY_DIR}/Debug/bbCreate/void-Package/${iLST} COPYONLY )
-	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/void-Package/${iLST} ${BBTK_BINARY_DIR}/Release/bbCreate/void-Package/${iLST} COPYONLY )
-    ELSE(WIN32)
-	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/void-Package/${iLST} ${BBTK_BINARY_DIR}/bin/bbCreate/void-Package/${iLST} COPYONLY )
-    ENDIF(WIN32)
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/void-Package/${iLST} 
+      ${BBTK_DATA_BUILD_PATH}/${bbCreatePackage_DATA_REL_PATH_FROM_DATA}/void-Package/${iLST} 
+      COPYONLY )
   ENDIF( ${subStrTmp} STREQUAL "../" )
 ENDFOREACH(iLST)
+# Install the build tree folder
+INSTALL( 
+  DIRECTORY ${BBTK_DATA_BUILD_PATH}/${bbCreatePackage_DATA_REL_PATH_FROM_DATA}/void-Package
+  DESTINATION ${BBTK_DATA_INSTALL_PATH}/${bbCreatePackage_DATA_REL_PATH_FROM_DATA}
+  )  
 
-
-SET(bbCreatePackage_DATA_REL_PATH ../${BBTK_DATA_REL_PATH}/CreatePackage)
+# Configure / Install the script bbCreatePackage
+SET(bbCreatePackage_DATA_REL_PATH_FROM_BIN ../${BBTK_DATA_REL_PATH}/${bbCreatePackage_DATA_REL_PATH_FROM_DATA})
+FILE(TO_NATIVE_PATH ${bbCreatePackage_DATA_REL_PATH_FROM_BIN} bbCreatePackage_DATA_REL_PATH_FROM_BIN)
 
 IF(WIN32)
-message("EED " ${CMAKE_CURRENT_SOURCE_DIR})
-message("EED " ${CMAKE_CURRENT_BINARY_DIR})
+  # Build tree 
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/bbCreatePackage.bat.in
+    ${BBTK_BINARY_DIR}/RelWithDebInfo/bbCreatePackage.bat
+    @ONLY IMMEDIATE
+    )
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbCreatePackage.bat.in
     ${BBTK_BINARY_DIR}/Debug/bbCreatePackage.bat
@@ -42,41 +55,25 @@ message("EED " ${CMAKE_CURRENT_BINARY_DIR})
     ${BBTK_BINARY_DIR}/Release/bbCreatePackage.bat
     @ONLY IMMEDIATE
     )
-  INSTALL_FILES(/bin .bat bbCreatePackage)
- # INSTALL_FILES(/bin .bbs bbCreatePackage)
-ENDIF(WIN32)
-
-
-IF(UNIX)
+  # install tree
+  INSTALL(
+    PROGRAMS ${BBTK_BINARY_DIR}/Debug/bbCreatePackage.bat
+    DESTINATION bin
+    )
+ELSE(WIN32)
+  # Build tree 
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/bbCreatePackage.sh.in
     ${BBTK_BINARY_DIR}/bin/bbCreatePackage
     @ONLY IMMEDIATE
     )
-
-# INSTALLS THE PROGRAM 
+  # Install tree
   INSTALL(
-    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bbCreatePackage
+    FILES ${BBTK_BINARY_DIR}/bin/bbCreatePackage
     DESTINATION bin
-    #    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     )
-##EED  INSTALL(
-##EED    FILES void-bbtk-package.tgz
-##EED    DESTINATION ${BBTK_DATA_REL_PATH}/bbCreatePackage
-##EED   )
-
- 
-#  CONFIGURE_FILE(
-#    ${CMAKE_CURRENT_SOURCE_DIR}/bbCreatePackage.bbs
-#    ${CMAKE_CURRENT_BINARY_DIR}/bbCreatePackage.bbs
-#    @ONLY IMMEDIATE
-#    )
-# INSTALL(
-#    FILES ${CMAKE_CURRENT_BINARY_DIR}/bbCreatePackage.bbs
-#    DESTINATION bin
-#    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-#  )
-ENDIF(UNIX)
+ENDIF(WIN32)