*** empty log message ***

[crea_ThirdParty_dlls.git] / instalL2 / CMakeLists.txt

diff --git a/instalL2/CMakeLists.txt b/instalL2/CMakeLists.txt
index 536c09f94800b4fa2f74e2a0f9f487949802c780..48b2e773835a9872e005b58446c5676779bc49c4 100644 (file)
--- a/instalL2/CMakeLists.txt
+++ b/instalL2/CMakeLists.txt
@@ -38,7 +38,7 @@ IF(WIN32 AND NOT UNIX)
   SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/crea_ThirdParty_dlls")
   SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/crea_ThirdParty_dlls")
   SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr")
-  SET(CPACK_NSIS_MODIFY_PATH ON)
+  SET(CPACK_NSIS_MODIFY_PATH OFF)
 ELSE(WIN32 AND NOT UNIX)
 #  SET(CPACK_STRIP_FILES "bin/bbi")
   SET(CPACK_SOURCE_STRIP_FILES "")
@@ -80,26 +80,43 @@ IF(WIN32)
        ENDFOREACH(iLST)        
        
        SET(MIKTEXDIR "${CREA_LIBRARY_DLL_PATH}/MikTex-2.7/")
+       
        INSTALL( 
                DIRECTORY ${MIKTEXDIR}
                DESTINATION bin/MikTex-2.7
        )                               
        
 #EED-08oct2009 STRING(REGEX REPLACE "\\\\" "/" ENVPATH "$ENV{Path}")
+
+       SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MikTex-2.7\\\\miktex\\\\bin")
+       SET(CREA_DLLS_DIR "$INSTDIR\\\\bin")
+       SET(CREATOOLS_DIRS ";${CREA_DLLS_DIR};${MIKTEX_INSTALL_DIR}")
+       
        
        SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS  "        
 
        
                WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\bin\\\\tth' 
-               WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'CREATOOLS_DIRS' '$INSTDIR\\\\bin;$INSTDIR\\\\bin\\\\MikTex-2.7\\\\miktex\\\\bin' 
+               WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'CREATOOLS_DIRS' '${CREATOOLS_DIRS}' 
 #EED-08oct2009         WriteRegExpandStr HKEY_LOCAL_MACHINE 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'Path' '${ENVPATH};$INSTDIR\\\\bin\\\\MikTex-2.7\\\\miktex\\\\bin'              
-               ReadEnvStr $R0 'PATH'
-        StrCpy $R0 '$R0;%CREATIS_DIRS%'
-        System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i('PATH', R0).r2'
+#JCP-09oct2009 Writing in the path     
 
                
+               !define Install_ReadEnvStr_RegKey 'HKCU \\\"Environment\\\"'
+               ReadRegStr $0 \\\${Install_ReadEnvStr_RegKey} 'PATH'
+        StrCpy $0 \\\"$0;%CREATOOLS_DIRS%\\\"
+        WriteRegExpandStr \\\${Install_ReadEnvStr_RegKey} 'PATH' $0
+       
                SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 
                ")
+               
+       SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS  "
+                       !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 
+       
+               ")
        
 ENDIF(WIN32)