X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=5dc628df484a80e4fa9654479b8fe937263ccb94;hb=2610644aed4d83f3b1e4260fc168c8f0852e6c2e;hp=06a60495a8ca377e19e5ef1246d1f002e7b89fd4;hpb=f522bc9eef10360ee38134c61c113800eadd3bb5;p=crea_ThirdParty_dlls.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 06a6049..5dc628d 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -61,53 +61,62 @@ IF(WIN32)
 	# INSTALL(   FILES ${WINDIR}/system32/msvcp71d.dll  				DESTINATION bin/ )
 	# INSTALL(   FILES ${WINDIR}/system32/msvcr71d.dll  				DESTINATION bin/ )	
 	
-	FILE(GLOB LST_FILE_DLL "${CREA_LIBRARY_DLL_PATH}/*.dll")
 	
-	FOREACH( iLST  ${LST_FILE_DLL} )
-	   INSTALL( 
-		 FILES ${iLST}
-		 DESTINATION bin/
-	   )
-	ENDFOREACH(iLST)	
+	INSTALL(DIRECTORY ${CREA_LIBRARY_DLL_PATH}/ 	DESTINATION bin/ )
+
+#EED 19-11-2009	
+#	FILE(GLOB LST_FILE_DLL "${CREA_LIBRARY_DLL_PATH}/*.dll")	
+#	FOREACH( iLST  ${LST_FILE_DLL} )
+#	   INSTALL( 
+#		 FILES ${iLST}
+#		 DESTINATION bin/
+#	   )
+#	ENDFOREACH(iLST)	
+
+#EED 19-11-2009	
+#	FILE(GLOB LST_FILE_TTH "${CREA_LIBRARY_DLL_PATH}/tth/*.*")
+#	FOREACH( iLST  ${LST_FILE_TTH} )
+#	   INSTALL( 
+#		 FILES ${iLST}
+#		 DESTINATION bin/tth/
+#	   )
+#	ENDFOREACH(iLST)	
 	
-	FILE(GLOB LST_FILE_TTH "${CREA_LIBRARY_DLL_PATH}/tth/*.*")
-	
-	FOREACH( iLST  ${LST_FILE_TTH} )
-	   INSTALL( 
-		 FILES ${iLST}
-		 DESTINATION bin/tth/
-	   )
-	ENDFOREACH(iLST)	
-	
-	SET(MIKTEXDIR "${CREA_LIBRARY_DLL_PATH}/MikTex-2.7/")
-	
-	INSTALL( 
-		DIRECTORY ${MIKTEXDIR}
-		DESTINATION bin/MikTex-2.7
-	)				
+#EED 19-11-2009	
+#	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")
+#EED 19-11-2009	
+#	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}")
+#EED 19-11-2009	
+#	SET(CREATIS_ENVIRONMENT_DIRS ";${CREA_DLLS_DIR};${MIKTEX_INSTALL_DIR}")
+	SET(CREATIS_THIRDPARTYDLLS_DIRS ";${CREA_DLLS_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 19-11-2009	
+#		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\bin\\\\tth' 
+
+		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'CREATIS_THIRDPARTYDLLS_DIRS' '${CREATIS_THIRDPARTYDLLS_DIRS}' 
 		
 		!define Install_ReadEnvStr_RegKey 'HKCU \\\"Environment\\\"'
 		ReadRegStr $0 \\\${Install_ReadEnvStr_RegKey} 'PATH'
 		
 		Push '$0;'
-		Push '%CREATOOLS_DIRS%'
+		Push '%CREATIS_THIRDPARTYDLLS_DIRS%'
 		Call StrStr
 		Pop $2
 		StrCmp $2 '' '' AddToPath_doneEED
-        StrCpy $0 \\\"$0;%CREATOOLS_DIRS%\\\"
+        StrCpy $0 \\\"$0;%CREATIS_THIRDPARTYDLLS_DIRS%\\\"
         WriteRegExpandStr \\\${Install_ReadEnvStr_RegKey} 'PATH' $0
 		
 		AddToPath_doneEED:
@@ -116,7 +125,7 @@ IF(WIN32)
 		
 	SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS  "
 			!define Uninstall_EnvStr_RegKey 'HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\"'			
-			WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'CREATOOLS_DIRS' ''
+			WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'CREATIS_THIRDPARTYDLLS_DIRS' ''
 		
 			SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000