X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=0245b45bf8cfefecb544ebfebc93eedb7c389aa1;hb=64500d4c2071ffcd7223583507af36e7e8ffaf21;hp=f832614589ad8974fd69abcd415077659c97b647;hpb=d64fc38049195a33ea8d61d49bc0e6bee3146ff3;p=crea_ThirdParty_dlls.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index f832614..0245b45 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -38,135 +38,90 @@ 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 "")
 ENDIF(WIN32 AND NOT UNIX)
 #SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickDialog" "Gimmick!")
-  
-
-INCLUDE(CPack)
-
 
 # Aditional INSTALL for CPACK mecanism.
 IF(WIN32)
 
-##  INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.dll DESTINATION bin ) 
-	 STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
-	 # INSTALL(   FILES ${WINDIR}/system32/msvcp71d.dll  				DESTINATION bin/ )
-	 # INSTALL(   FILES ${WINDIR}/system32/msvcr71d.dll  				DESTINATION bin/ )
-
-	  IF(USE_VTK)
-		SET(VTK_BIN_DIR ${VTK_DIR}/../../bin )
-
-		FILE(GLOB LST_FILE_VTKDLL "${VTK_BIN_DIR}/*.dll")
-		FOREACH( iLST  ${LST_FILE_VTKDLL} )
-		   INSTALL( 
-			 FILES ${iLST}
-			 DESTINATION bin/
-		   )
-		ENDFOREACH(iLST)
-	  ENDIF(USE_VTK)
-		
-	  IF(USE_ITK)
-		INSTALL(   FILES ${ITK_DIR}/bin/release/ITKCommon.dll   	DESTINATION bin/ )
-	  ENDIF(USE_ITK)
-
-	  IF(USE_WXWIDGETS)
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll   			DESTINATION bin/ )
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll   	DESTINATION bin/ )
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll	   			DESTINATION bin/ )
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll   		DESTINATION bin/ )
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_html_vc_custom.dll   		DESTINATION bin/ )
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll	   			DESTINATION bin/ )
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_core_vc_custom.dll   		DESTINATION bin/ )
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll   			DESTINATION bin/ )
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll   			DESTINATION bin/ )
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_xml_vc_custom.dll   		DESTINATION bin/ )
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll	   			DESTINATION bin/ )
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_odbc_vc_custom.dll   		DESTINATION bin/ )
-		INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll  			DESTINATION bin/ )
-	  ENDIF(USE_WXWIDGETS)
-
-	  IF(USE_GDCM)
-		INSTALL(   FILES ${GDCM_DIR}/bin/release/gdcm.dll 					DESTINATION bin/ )
-		INSTALL(   FILES ${GDCM_DIR}/bin/release/gdcmjpeg8.dll 			DESTINATION bin/ )
-		INSTALL(   FILES ${GDCM_DIR}/bin/release/gdcmjpeg12.dll 			DESTINATION bin/ )
-		INSTALL(   FILES ${GDCM_DIR}/bin/release/gdcmjpeg16.dll 			DESTINATION bin/ )
-		INSTALL(   FILES ${GDCM_DIR}/bin/release/gdcmopenjpeg.dll 			DESTINATION bin/ )
-		INSTALL(   FILES ${GDCM_DIR}/bin/release/vtkgdcm.dll 				DESTINATION bin/ )
-	  ENDIF(USE_GDCM)
-
-	  IF(USE_BOOST)
-		FILE(GLOB LST_FILE_BOOSTDLL "${_boost_LIBRARIES_SEARCH_DIRS}/*.dll")
-		FOREACH( iLST  ${LST_FILE_BOOSTDLL} )
-		   INSTALL( 
-			 FILES ${iLST}
-			 DESTINATION bin/
-		   )
-		ENDFOREACH(iLST)    
-	  ENDIF(USE_BOOST)		
-
-	  IF(USE_QT4)
-		FILE(GLOB LST_FILE_QT4DLL "${QT_LIBRARY_DIR}/*.dll")
-		FOREACH( iLST  ${LST_FILE_QT4DLL} )
-		   INSTALL( 
-			 FILES ${iLST}
-			 DESTINATION bin/
-		   )
-		ENDFOREACH(iLST)    
-	  ENDIF(USE_QT4)		
+	set  (MessageLibraryPath "CREA_LIBRARY_DLL_PATH (itk,vtk,gdcm,wx,Qt,tth)")
+	set  (CREA_LIBRARY_DLL_PATH  "" CACHE PATH ${MessageLibraryPath} )	
 
+  
+	IF(NOT CREA_LIBRARY_DLL_PATH)
+		MESSAGE(FATAL_ERROR "${MessageLibraryPath}  not found")
+	ENDIF(NOT CREA_LIBRARY_DLL_PATH)
 
+##  INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.dll DESTINATION bin ) 
+	STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
+	# 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)	
+	
+	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-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' '${CREATOOLS_DIRS}' 
+		
+		!define Install_ReadEnvStr_RegKey 'HKCU \\\"Environment\\\"'
+		ReadRegStr $0 \\\${Install_ReadEnvStr_RegKey} 'PATH'
+		
+		Push "$0;"
+		Push "%CREATOOLS_DIRS%"
+		Call StrStr
+		Pop $2
+		StrCmp $2 "" "" AddToPath_doneEED
+        StrCpy $0 \\\"$0;%CREATOOLS_DIRS%\\\"
+        WriteRegExpandStr \\\${Install_ReadEnvStr_RegKey} 'PATH' $0
+		SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 
+		
+		AddToPath_doneEED:
+	")
+		
+	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)
 
-
-
-
-
-
-
-IF(EXWIN32)
-
-OPTION(BBTK_STANDALONE_INSTALLER "Install and add to installer all dlls needed, including from external toolkits (wx,itk,vtk)?" OFF)
-
-IF(BBTK_STANDALONE_INSTALLER)
-  STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
-  #INSTALL(   FILES ${WINDIR}/system32/msvcp71d.dll  				DESTINATION bin/ )
-  #INSTALL(   FILES ${WINDIR}/system32/msvcr71d.dll  				DESTINATION bin/ )
-
-  IF(USE_VTK)
-    SET(VTK_BIN_DIR ${VTK_DIR}/../../bin )
-
-    FILE(GLOB LST_FILE_VTKDLL "${VTK_BIN_DIR}/*.dll")
-    FOREACH( iLST  ${LST_FILE_VTKDLL} )
-       INSTALL( 
-         FILES ${iLST}
-         DESTINATION bin/
-       )
-    ENDFOREACH(iLST)
-  ENDIF(USE_VTK)
-    
-  IF(USE_ITK)
-    INSTALL(   FILES ${ITK_DIR}/bin/ITKCommon.dll   	DESTINATION bin/ )
-  ENDIF(USE_ITK)
-
-  IF(USE_WXWIDGETS)
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll   	DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll	   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_html_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll	   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_core_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_xml_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll	   			DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_odbc_vc_custom.dll   		DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll  			DESTINATION bin/ )
-  ENDIF(USE_WXWIDGETS)
-ENDIF(BBTK_STANDALONE_INSTALLER)
-
-ENDIF(EXWIN32)
+INCLUDE(CPack)
\ No newline at end of file