#3222 CreaTools Feature New Normal - vtk8itk4wx3-mingw64

diff --combined install/CMakeLists.txt
index 95f7f554a80a7f5a395bf256a906a130362c34fe,01ea667c99060e7def6b4a01ee9c94b78b33eb32..5fef39db2d06f6301e77ab9ea277e8d06f1fa2f4
--- 1/install/CMakeLists.txt
--- 2/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@@ -44,20 -44,21 +44,20 @@@ SET(CPACK_PACKAGE_VERSION_MINOR ${PROJE
  SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION})
  
  #  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 -  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 +  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CREATIS\\\\CreaTools-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
    IF(WIN32)
      SET(CMAKE_INSTALL_PREFIX C:/CreaTools/CeaTools)
    ENDIF(WIN32)
  
  
  
 -
 -
  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.
  #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")
 -#EED 01/05/2013  SET(CPACK_NSIS_DISPLAY_NAME "CreaTools")
 +
 +  SET(CPACK_NSIS_DISPLAY_NAME "${PROJECT_NAME}")
    SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}")
    SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}")
    SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr")
@@@ -131,6 -132,7 +131,6 @@@
  
                SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 
  
 -              CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Update_CreaTools.lnk' '${CREATOOLS_DIRBIN}\\\\UpdateCreatools.bat.lnk' 
                CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\CreaTools_HomePage.lnk' '${CREATOOLS_DIRBIN}\\\\start.bat'  'www.creatis.insa-lyon.fr/site7/creatools'
                CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\CreaTools.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'bbi.exe bbs\\\\creaMiniTools\\\\appli\\\\minitoolsMenu.bbs'
  
@@@ -168,6 -170,7 +168,7 @@@
                Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\CreaTools_HomePage.lnk'
                Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\ creaTools.lnk'
                Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Version.txt.lnk'
+               Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Update_CreaTools.lnk'
                
  #             Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Developer_Tools\\\\creaNewProject.lnk'
  #             Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Developer_Tools\\\\bbStudio.lnk'
@@@ -216,7 -219,6 +217,7 @@@ ENDIF(WIN32 AND NOT UNIX
  
  INCLUDE(CPack)
  
 +message("-------------------------------- "${CREATOOLS_SOURCE_PATH})
  
  # Aditional INSTALL for CPACK mecanism.
  IF (WIN32)
@@@ -227,19 -229,18 +228,19 @@@
  INSTALL(FILES ${${CMAKE_PROJECT_NAME}_BINARY_DIR}/Version.txt DESTINATION . )
  
  INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/bin/                                                  DESTINATION bin  )
 -INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/data/                                                         DESTINATION bin/data  )
 -INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BASE}/                   DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 -INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BBTK}/                   DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 -INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_MARACASVISU}/            DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 -INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_VTK}/                            DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 -INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IMAGEIO}/                        DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 -INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_CONTOURS}/               DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 -INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_ENVIRIONMENT}/   DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 -INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_RECALAGE}/               DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 -INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BRUKER}/                         DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 -INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BBTKGEDITOR}/            DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 -INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_MINITOOLS}/              DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 +INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/data/                                                         DESTINATION bin/data  ) 
 +INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}/                                   DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 +#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BASE}/                  DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 +#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BBTK}/                  DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 +#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_MARACASVISU}/           DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 +#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_VTK}/                           DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 +#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IMAGEIO}/                       DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 +#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_CONTOURS}/              DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 +#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_ENVIRIONMENT}/  DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 +#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_RECALAGE}/              DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 +#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BRUKER}/                        DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 +#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BBTKGEDITOR}/           DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 +#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_MINITOOLS}/             DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
  #INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IRM}/                   DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
  ENDIF (WIN32)