]> Creatis software - creaTools.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 14 Dec 2009 13:29:23 +0000 (13:29 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 14 Dec 2009 13:29:23 +0000 (13:29 +0000)
install/CMakeLists.txt

index 6b05c4b92a370309ee0fdd312e4b08a9f07434dc..b471d55db19ed90e9daf72d726aae4eca00e93f5 100644 (file)
@@ -94,11 +94,6 @@ IF(WIN32 AND NOT UNIX)
   
   
    SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS  "
-
-               SetShellVarContext current
-               StrCpy $R0 \\\"$DOCUMENTS\\\\..\\\\.bbtk\\\\doc\\\"
-               RMDir /r $R0
-
    
           !define Install_ReadEnvStr_RegKey 'HKCU \\\"Environment\\\"'
                ReadRegStr $0 \\\${Install_ReadEnvStr_RegKey} 'PATH'
@@ -135,13 +130,15 @@ IF(WIN32 AND NOT UNIX)
 #              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
+
+   ")
+               
+       SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS  "
+       
        
                !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
                Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\creatisNewProject.lnk'
@@ -159,6 +156,11 @@ IF(WIN32 AND NOT UNIX)
                !define Uninstall_EnvStr_RegKey 'HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\"'                 
                WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'CREATOOLS_DIRS' ''             
                SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 
+               
+               SetShellVarContext current
+               StrCpy $R0 \\\"$DOCUMENTS\\\\..\\\\.bbtk\\\\doc\\\"
+               RMDir /r $R0
+               
        ")