X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Finstall%2Fcpack%2FCMakeLists.txt;h=9ccd62079b39462dc4689dd6583ab618bba7b229;hb=f72d94f32545c8a49d524dba4847174e08a30996;hp=6d17f8dfde690489e413f7b194cbdf838b92fd22;hpb=8f72b9ec6b72850975d47e4da84a9ad501e3821d;p=bbtk.git

diff --git a/kernel/install/cpack/CMakeLists.txt b/kernel/install/cpack/CMakeLists.txt
index 6d17f8d..9ccd620 100644
--- a/kernel/install/cpack/CMakeLists.txt
+++ b/kernel/install/cpack/CMakeLists.txt
@@ -21,10 +21,11 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR ${BBTK_MAJOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_MINOR ${BBTK_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH ${BBTK_BUILD_VERSION})
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "bbtk ${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}")
-IF(WIN32 AND NOT UNIX)
   # There is a bug in NSI that does not handle full unix paths properly. Make
   # sure there is at least one set of four (4) backlasshes.
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\bbtk-${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}")
+#SET(CPACK_SOURCE_PACKAGE_FILE_NAME "bbtk-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+IF(WIN32 AND NOT UNIX)
 #EED  SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/kernel/install/gnome/bbi-icon2.bmp")
   SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/BBI_EXE.exe")
   SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
@@ -36,7 +37,7 @@ ELSE(WIN32 AND NOT UNIX)
   SET(CPACK_STRIP_FILES "bin/bbi")
   SET(CPACK_SOURCE_STRIP_FILES "")
 ENDIF(WIN32 AND NOT UNIX)
-SET(CPACK_PACKAGE_EXECUTABLES "bbStudio" "bbStudio" "bbPackageBrowser" "bbPackageBrowser" "bbi" "bbInterpreter")
+SET(CPACK_PACKAGE_EXECUTABLES "bbStudio" "bbStudio" "bbPackageBrowser" "bbPackageBrowser" "bbi" "bbInterpreter" "bbRegeneratePackageDoc" "Regenerate packages doc" "bbRegenerateBoxesLists" "Regenerate boxes lists")
   
 
 INCLUDE(CPack)
@@ -66,7 +67,7 @@ IF(BBTK_STANDALONE_INSTALLER)
   ENDIF(USE_VTK)
     
   IF(USE_ITK)
-    INSTALL(   FILES ${ITK_DIR}/bin/ITKCommon.dll   	DESTINATION bin/ )
+    INSTALL(   FILES ${ITK_DIR}/../../bin/ITKCommon.dll   	DESTINATION bin/ )
   ENDIF(USE_ITK)
 
   IF(USE_WXWIDGETS)