Merge branch 'vtk7itk4wx3-mingw64' of ssh://git.creatis.insa-lyon.fr/creaTools into...

diff --combined install/CMakeLists.txt
index 875226f03cc093ac78f5e4c39779728d5f8e318c,0189359342b1fcb7a9eba8e9378adaabd38c846e..0b82604a461f93c5c16f41a4026c15e4542ef59b
--- 1/install/CMakeLists.txt
--- 2/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@@ -132,7 -132,7 +132,7 @@@ IF(WIN32 AND NOT UNIX
  
                SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 
  
 -              CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\CreaTools_HomePage.lnk' '${CREATOOLS_DIRBIN}\\\\start.bat'  'www.creatis.insa-lyon.fr/site/creatools'
 +              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'
  
  #             CreateDirectory '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Developer_Tools'
@@@ -217,6 -217,7 +217,7 @@@ ENDIF(WIN32 AND NOT UNIX
  
  INCLUDE(CPack)
  
+ message("-------------------------------- "${CREATOOLS_SOURCE_PATH})
  
  # Aditional INSTALL for CPACK mecanism.
  IF (WIN32)
@@@ -227,18 -228,19 +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)