X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=instalL2%2FCMakeLists.txt;h=6f86ff9fe56637816b4647c0e4f4c57490d1d254;hb=3740f9d018b889284096c525eb3cb23cdb6e84a8;hp=5135a41c452ad08cc0089ff3be66e7e717a0cd30;hpb=3616e88aaaa63e29421d4a6221cc97df599f9ff6;p=crea_ThirdParty_dlls.git

diff --git a/instalL2/CMakeLists.txt b/instalL2/CMakeLists.txt
index 5135a41..6f86ff9 100644
--- a/instalL2/CMakeLists.txt
+++ b/instalL2/CMakeLists.txt
@@ -44,15 +44,11 @@ ELSE(WIN32 AND NOT UNIX)
   SET(CPACK_SOURCE_STRIP_FILES "")
 ENDIF(WIN32 AND NOT UNIX)
 #SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickDialog" "Gimmick!")
-  
-
-INCLUDE(CPack)
-
 
 # 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} )	
 
   
@@ -81,11 +77,46 @@ IF(WIN32)
 		 FILES ${iLST}
 		 DESTINATION bin/tth/
 	   )
-	ENDFOREACH(iLST)
+	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(CREATOOLS_DIRS "${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' '${CREATOOLS_DIRS}' 
+#EED-08oct2009		WriteRegExpandStr HKEY_LOCAL_MACHINE 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'Path' '${ENVPATH};$INSTDIR\\\\bin\\\\MikTex-2.7\\\\miktex\\\\bin'		
+#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
 	
-	SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS  "		
-		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\${CREA_LIBRARY_DLL_PATH}\\\\tth' 
 		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)
+
+INCLUDE(CPack)
\ No newline at end of file