From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Fri, 9 Oct 2009 14:04:23 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2c5ed9caff0e5f89aff8837b389fa956cc375533;hp=1396d3103e31f0605f7e9ee12626ca40eeda9c77;p=crea_ThirdParty_dlls.git

*** empty log message ***
---

diff --git a/instalL2/CMakeLists.txt b/instalL2/CMakeLists.txt
index 711b6a9..536c09f 100644
--- a/instalL2/CMakeLists.txt
+++ b/instalL2/CMakeLists.txt
@@ -48,7 +48,7 @@ ENDIF(WIN32 AND NOT UNIX)
 # Aditional INSTALL for CPACK mecanism.
 IF(WIN32)
 
-	set  (MessageLibraryPath "CREA_DLL_DESTINATION_PATH (itk,vtk,gdcm,wx,Qt,tth)")
+	set  (MessageLibraryPath "CREA_LIBRARY_DLL_PATH (itk,vtk,gdcm,wx,Qt,tth)")
 	set  (CREA_LIBRARY_DLL_PATH  "" CACHE PATH ${MessageLibraryPath} )	
 
   
@@ -85,14 +85,18 @@ IF(WIN32)
 		DESTINATION bin/MikTex-2.7
 	)				
 	
-	STRING(REGEX REPLACE "\\\\" "/" ENVPATH "$ENV{Path}")
+#EED-08oct2009	STRING(REGEX REPLACE "\\\\" "/" ENVPATH "$ENV{Path}")
 	
 	SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS  "	
 
 	
 		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\bin\\\\tth' 
-		WriteRegExpandStr HKEY_LOCAL_MACHINE 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'Path' '${ENVPATH};$INSTDIR\\\\bin\\\\MikTex-2.7\\\\miktex\\\\bin'		
-		
+		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'CREATOOLS_DIRS' '$INSTDIR\\\\bin;$INSTDIR\\\\bin\\\\MikTex-2.7\\\\miktex\\\\bin' 
+#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'
+
 		
 		SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 
 		")