From: Eduardo Davila Date: Mon, 9 Nov 2009 18:38:32 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~11 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=553a6521c5dde644a72b15a930ffa21719bbc5cb;hp=a9a3a27febfae18dd9f2f4dcf96924106ced640f;p=creaTools.git *** empty log message *** --- diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt index e261a5c..fe78a19 100644 --- a/install/CMakeLists.txt +++ b/install/CMakeLists.txt @@ -79,17 +79,15 @@ IF(WIN32 AND NOT UNIX) SET(MIKTEX_INSTALL_DIRBIN "$INSTDIR\\\\bin\\\\MikTex-2.7\\\\miktex\\\\bin") SET(CREA_DLLS_DIRBIN "$INSTDIR\\\\bin") -# SET(CREA_BASE_DIRBIN "$INSTDIR\\\\${CREA_BASE}\\\\bin") -# SET(CREA_BBTK_DIRBIN "$INSTDIR\\\\${CREA_BBTK}\\\\bin") -# SET(CREA_MARACASVISU_DIRBIN "$INSTDIR\\\\${CREA_MARACASVISU}\\\\bin") -# SET(CREA_IMAGEIO_DIRBIN "$INSTDIR\\\\${CREA_IMAGEIO}\\\\bin") -# SET(CREA_CONTOURS_DIRBIN "$INSTDIR\\\\${CREA_CONTOURS}\\\\bin") -# SET(CREA_ENVIRIONMENT_DIRBIN "$INSTDIR\\\\${CREA_ENVIRIONMENT}\\\\bin") -# SET(CREA_RECALAGE_DIRBIN "$INSTDIR\\\\${CREA_RECALAGE}\\\\bin") -# SET(CREATOOLS_DIRS ";${CREA_DLLS_DIRBIN};${MIKTEX_INSTALL_DIRBIN};${CREA_BASE_DIRBIN};${CREA_BBTK_DIRBIN};${CREA_MARACASVISU_DIRBIN};${CREA_IMAGEIO_DIRBIN};${CREA_CONTOURS_DIRBIN};${CREA_ENVIRIONMENT_DIRBIN};${CREA_RECALAGE_DIRBIN}") + SET(CREA_BASE_DIRBIN "$INSTDIR\\\\${CREA_BASE}\\\\bin") + SET(CREA_BBTK_DIRBIN "$INSTDIR\\\\${CREA_BBTK}\\\\bin") + SET(CREA_MARACASVISU_DIRBIN "$INSTDIR\\\\${CREA_MARACASVISU}\\\\bin") + SET(CREA_IMAGEIO_DIRBIN "$INSTDIR\\\\${CREA_IMAGEIO}\\\\bin") + SET(CREA_CONTOURS_DIRBIN "$INSTDIR\\\\${CREA_CONTOURS}\\\\bin") + SET(CREA_ENVIRIONMENT_DIRBIN "$INSTDIR\\\\${CREA_ENVIRIONMENT}\\\\bin") + SET(CREA_RECALAGE_DIRBIN "$INSTDIR\\\\${CREA_RECALAGE}\\\\bin") SET(CREATOOLS_DIRS ";${CREA_DLLS_DIRBIN};${MIKTEX_INSTALL_DIRBIN}") -# SET(TTH_DIRBIN "$INSTDIR\\\\${CREA_THIRDPARTY_DLLS}\\\\bin\\\\tth") SET(TTH_DIRBIN "$INSTDIR\\\\bin\\\\tth") SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " @@ -98,19 +96,20 @@ IF(WIN32 AND NOT UNIX) StrCpy $0 \\\"$0;%CREATOOLS_DIRS%\\\" WriteRegExpandStr \\\${Install_ReadEnvStr_RegKey} 'PATH' $0 - CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Viewing1UPS.lnk' 'bbi.exe' demo\\\\appli\\\\demoViewing1.bbs CreateDirectory '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos' - CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\Filtering1UPS.lnk' 'bbi.exe' demo\\\\appli\\\\demoFiltering1.bbs + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\creatisFilter01.lnk' 'bbi.exe' demo\\\\appli\\\\demoFiltering1.bbs + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\creatisViewing01.lnk' 'bbi.exe' demo\\\\appli\\\\demoViewing1.bbs + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\creatisShowNPoints.lnk' 'bbi.exe' bbs\\\\creaMaracasVisu\\\\appli\\\\ExampleShowNPoints.bbs - WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'x_CREATOOLS_DIRS' '${CREATOOLS_DIRS}' - WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'x_TTH' '${TTH_DIRBIN}' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'CREATOOLS_DIRS' '${CREATOOLS_DIRS}' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '${TTH_DIRBIN}' - WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'x_BOOST_ROOT' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_BOOST_LYBRARY}' - WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'x_GDCM_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_GDCM_LYBRARY}\\\\lib\\\\gdcm' - WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'x_ITK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_ITK_LYBRARY}\\\\lib\\\\InsightToolkit' - WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'x_QTDIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_QT_LYBRARY}' - WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'x_VTK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_VTK_LYBRARY}\\\\lib\\\\vtk-5.4' - WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'x_WXWIN' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_WXWIN_LYBRARY}' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'BOOST_ROOT' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_BOOST_LYBRARY}' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'GDCM_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_GDCM_LYBRARY}\\\\lib\\\\gdcm' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'ITK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_ITK_LYBRARY}\\\\lib\\\\InsightToolkit' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'QTDIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_QT_LYBRARY}' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'VTK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_VTK_LYBRARY}\\\\lib\\\\vtk-5.4' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'WXWIN' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_WXWIN_LYBRARY}' SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 @@ -118,8 +117,9 @@ IF(WIN32 AND NOT UNIX) SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP - Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Viewing1UPS.lnk' - Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\Filtering1UPS.lnk' + Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\creatisFilter01.lnk' + Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\creatisViewing01.lnk' + Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\creatisShowNPoints.lnk' StrCpy $MUI_TEMP '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos' RMDir $MUI_TEMP @@ -136,9 +136,10 @@ ELSE(WIN32 AND NOT UNIX) SET(CPACK_STRIP_FILES "${CREA_BBTK}\\\\ubs.bat;kkk.rrr") SET(CPACK_SOURCE_STRIP_FILES "") ENDIF(WIN32 AND NOT UNIX) -SET(CPACK_PACKAGE_EXECUTABLES "${CREA_BBTK}\\\\bbStudio" "bbStudio" - "${CREA_BBTK}\\\\bbInterpreter" "bbInterpreter" - "${CREA_BBTK}\\\\IRMMain" "creatisContours") +SET(CPACK_PACKAGE_EXECUTABLES "${CREA_BBTK}\\\\bbStudio" "creatisStudio" + "${CREA_BBTK}\\\\bbInterpreter" "creatisInterpreter" + "${CREA_BBTK}\\\\IRMMain.exe" "creatisCartography" + "${CREA_BBTK}\\\\crea-0.3.1\\\\bin\\\\creaNewProject.exe" "creatisNewProyect" ) INCLUDE(CPack) @@ -149,17 +150,17 @@ IF (WIN32) INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_THIRDPARTY_DLLS}\\\\bin/ DESTINATION "${CREATOOLS_DESTINATION_PATH}/bin" ) INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_THIRDPARTY_LIBRARIES}\\\\Library/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) -#INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BASE} 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_IMAGEIO}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) +INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IMAGEIO}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_MARACASVISU}/ 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_IRM}/ 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_IRM}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) ENDIF (WIN32)