From 53d4f5d1026a4a9aa8807c911ef3f3c4ec713184 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Wed, 9 Dec 2009 17:00:54 +0000 Subject: [PATCH] *** empty log message *** --- CMakeLists.txt | 2 +- Steps.txt | 1 + install/CMakeLists.txt | 104 +++++++++++++++++++++++++++-------------- 3 files changed, 71 insertions(+), 36 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e6aa2ac..7f50f06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ################################### -PROJECT(creaInstaller) +PROJECT(creaTools) ################################### #================================== diff --git a/Steps.txt b/Steps.txt index 9f4c1c4..b60b54a 100644 --- a/Steps.txt +++ b/Steps.txt @@ -62,6 +62,7 @@ create directory C:/temp2_CM28VC9/dlls install boost, then move dlls in dlls directory install vtk, then move dlls in dlls directory install itk, then move dlls in dlls directory +install GDCM, then move dlls AND exe in dlls directory copy wxWidgets in C:/temp2_CM28VC9/ directory, then move dlls in dlls directory copy Qt4.5.2 in C:/temp2_CM28VC9/ directory, then move dlls in dlls directory diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt index fe78a19..6b05c4b 100644 --- a/install/CMakeLists.txt +++ b/install/CMakeLists.txt @@ -64,12 +64,12 @@ IF(WIN32 AND NOT UNIX) set (CREA_BRUKER creaBruker-1.0.0) set (CREA_IRM creaIRM-1.0.1) - set (CREA_BOOST_LYBRARY "boost-1.40.0") - set (CREA_GDCM_LYBRARY "gdcm110909") - set (CREA_ITK_LYBRARY "itk-3.14.0") - set (CREA_QT_LYBRARY "Qt4.5.2") - set (CREA_VTK_LYBRARY "vtk-5.4.2") - set (CREA_WXWIN_LYBRARY "wxWidgets-2.8.10") +# set (CREA_BOOST_LYBRARY "boost-1.40.0") +# set (CREA_GDCM_LYBRARY "gdcm110909") +# set (CREA_ITK_LYBRARY "itk-3.14.0") +# set (CREA_QT_LYBRARY "Qt4.5.2") +# set (CREA_VTK_LYBRARY "vtk-5.4.2") +# set (CREA_WXWIN_LYBRARY "wxWidgets-2.8.10") IF(NOT CREATOOLS_SOURCE_PATH) @@ -77,7 +77,9 @@ IF(WIN32 AND NOT UNIX) ENDIF(NOT CREATOOLS_SOURCE_PATH) - SET(MIKTEX_INSTALL_DIRBIN "$INSTDIR\\\\bin\\\\MikTex-2.7\\\\miktex\\\\bin") +# SET(TTH_DIRBIN "$INSTDIR\\\\bin\\\\tth") +# SET(MIKTEX_INSTALL_DIRBIN "$INSTDIR\\\\bin\\\\MikTex-2.7\\\\miktex\\\\bin") + SET(CREATOOLS_DIRBIN "$INSTDIR\\\\bin") SET(CREA_DLLS_DIRBIN "$INSTDIR\\\\bin") SET(CREA_BASE_DIRBIN "$INSTDIR\\\\${CREA_BASE}\\\\bin") SET(CREA_BBTK_DIRBIN "$INSTDIR\\\\${CREA_BBTK}\\\\bin") @@ -86,37 +88,68 @@ IF(WIN32 AND NOT UNIX) 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(CREATOOLS_DIRS "${CREA_DLLS_DIRBIN};${MIKTEX_INSTALL_DIRBIN}") + SET(CREATOOLS_DIRS "${CREATOOLS_DIRBIN}") - SET(TTH_DIRBIN "$INSTDIR\\\\bin\\\\tth") SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " - !define Install_ReadEnvStr_RegKey 'HKCU \\\"Environment\\\"' - ReadRegStr $0 \\\${Install_ReadEnvStr_RegKey} 'PATH' - StrCpy $0 \\\"$0;%CREATOOLS_DIRS%\\\" - WriteRegExpandStr \\\${Install_ReadEnvStr_RegKey} 'PATH' $0 + + SetShellVarContext current + StrCpy $R0 \\\"$DOCUMENTS\\\\..\\\\.bbtk\\\\doc\\\" + RMDir /r $R0 + + !define Install_ReadEnvStr_RegKey 'HKCU \\\"Environment\\\"' + ReadRegStr $0 \\\${Install_ReadEnvStr_RegKey} 'PATH' + + Push '$0;' + Push '%CREATOOLS_DIRS%' + Call StrStr + Pop $2 + StrCmp $2 '' '' AddToPath_doneEED + StrCpy $0 \\\"$0;%CREATOOLS_DIRS%\\\" + WriteRegExpandStr \\\${Install_ReadEnvStr_RegKey} 'PATH' $0 + + AddToPath_doneEED: + SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 + + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\creatisNewProject.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'creaNewProject.exe' + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\creatisStudio.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'bbStudio.exe' + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\creatisInterpreter.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'bbi.exe' + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\creatisContours.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'wxContourGUIExample.exe' + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\creatisCartography.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'IRMMain.exe' CreateDirectory '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos' - 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 + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\creatisFilter01.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'bbi.exe demo\\\\appli\\\\demoFiltering1.bbs' + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\creatisViewing01.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'bbi.exe demo\\\\appli\\\\demoViewing1.bbs' + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Demos\\\\creatisShowNPoints.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat' 'bbi.exe bbs\\\\creaMaracasVisu\\\\appli\\\\ExampleShowNPoints.bbs' 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' '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 - +# WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '${TTH_DIRBIN}' +# 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 ") SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " + + SetShellVarContext current + StrCpy $R0 \\\"$DOCUMENTS\\\\..\\\\.bbtk\\\\doc\\\" + RMDir /r $R0 + !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP + Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\creatisNewProject.lnk' + Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\creatisContours.lnk' + Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\creatisStudio.lnk' + Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\creatisInterpreter.lnk' + Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\creatisCartography.lnk' + Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\creatisFilter01.lnk' Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\creatisViewing01.lnk' Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Demos\\\\creatisShowNPoints.lnk' @@ -136,10 +169,12 @@ 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" "creatisStudio" - "${CREA_BBTK}\\\\bbInterpreter" "creatisInterpreter" - "${CREA_BBTK}\\\\IRMMain.exe" "creatisCartography" - "${CREA_BBTK}\\\\crea-0.3.1\\\\bin\\\\creaNewProject.exe" "creatisNewProyect" ) + +#EED 20 Nov 2009 +#SET(CPACK_PACKAGE_EXECUTABLES "bbStudio" "creatisStudio" +# "bbi" "creatisInterpreter" +# "IRMMain" "creatisCartography" +# "creaNewProject" "creatisNewProyect" ) INCLUDE(CPack) @@ -148,14 +183,13 @@ INCLUDE(CPack) # Aditional INSTALL for CPACK mecanism. 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_BBTK}/ DESTINATION ${CREATOOLS_DESTINATION_PATH} ) +#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_BBTK}/ 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} ) -- 2.47.1