X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fcmake%2Fcrea_ThirdParty_Libraries%2Finstall%2FCMakeLists.txt;h=14fa7ec285da26109b57d51af9fd94ee9a76c5b7;hb=6a4393e29e2ad4c755ff2d31d53e0f9823ddd1bd;hp=223e25b05cec3fb6ab96911108cc1e2244a9153f;hpb=a37d18909c36e1bcd3427106fa70b91dd5b6c108;p=creaToolsTools.git

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
index 223e25b..14fa7ec 100644
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
@@ -49,14 +49,14 @@ IF(WIN32 AND NOT UNIX)
   SET(CPACK_NSIS_MODIFY_PATH OFF)
 
 
-  set  (CREA_BOOST_LYBRARY	Boost-1.47.0)
-  set  (CREA_GDCM_LYBRARY	gdcm )
-  set  (CREA_ITK_LYBRARY	InsightToolkit-3.20.0 )
-  set  (CREA_QT_LYBRARY		Qt-4.7.3 )
-  set  (CREA_VTK_LYBRARY	VTK )  
-  set  (CREA_WXWIN_LYBRARY	wxWidgets-2.9.2)
-  set  (CREA_XERCES_LYBRARY	xerces-c-3.1.1)
-  set  (CREA_MIKATEX_LYBRARY	MiKTeX-2.9)
+  set  (CREA_BOOST_LYBRARY	boost)
+  set  (CREA_GDCM_LYBRARY	gdcm13 )
+  set  (CREA_ITK_LYBRARY	itk )
+  set  (CREA_QT_LYBRARY		qt )
+  set  (CREA_VTK_LYBRARY	vtk )  
+  set  (CREA_WXWIN_LYBRARY	wxWidgets)
+  set  (CREA_XERCES_LYBRARY	xerces)
+  #DFCH -- set  (CREA_MIKATEX_LYBRARY miktex)
   
   #set  (CREA_KWWIDGETS_LYBRARY   KWWidgets-090109 )
   
@@ -92,29 +92,19 @@ IF (WIN32)
 	   )
 	ENDFOREACH(iLST)	
 	
-	# MikTex
-	FILE(GLOB LST_FILE_MIKATEX "${CREA_LIBRARY_SOURCE_PATH}/${CREA_MIKATEX_LYBRARY}/*.*")
-	FOREACH( iLSTM  ${LST_FILE_MIKATEX} )
-	   INSTALL( 
-		 FILES ${iLSTM}
-		 DESTINATION bin/${CREA_MIKATEX_LYBRARY}/
-	   )
-	ENDFOREACH(iLSTM)
-
-
-INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_MIKATEX_LYBRARY}	DESTINATION ${CREA_BIN_DESTINATION_PATH} )
-
+	 #DFCH -- INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_MIKATEX_LYBRARY}	DESTINATION ${CREA_BIN_DESTINATION_PATH} )
 	INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_BOOST_LYBRARY}	DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
 	INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_GDCM_LYBRARY}	DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
 	INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_ITK_LYBRARY}	DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
-	INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_QT_LYBRARY}	DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
+	INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_QT_LYBRARY}		DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
 	INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_VTK_LYBRARY}	DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
 	INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_WXWIN_LYBRARY}	DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
 	INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_XERCES_LYBRARY}	DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
 
 	
-	SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MiKTeX-2.9\\\\miktex\\\\bin")
-	SET(CREATIS_THIRDPARTYLIBRARIES_DIRS ";${MIKTEX_INSTALL_DIR}")
+	 #DFCH -- SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MiKTeX-2.9\\\\miktex\\\\bin")
+	 #DFCH -- SET(CREATIS_THIRDPARTYLIBRARIES_DIRS ";${MIKTEX_INSTALL_DIR}")
+	 SET(CREATIS_THIRDPARTYLIBRARIES_DIRS "") #DFCH
 
 	SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS  "	
 		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\bin\\\\tth' 
@@ -136,7 +126,7 @@ INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_MIKATEX_LYBRARY}	DESTINA
 		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'GDCM_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_GDCM_LYBRARY}\\\\lib\\\\gdcm' 
 		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'ITK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_ITK_LYBRARY}\\\\lib\\\\InsightToolkit' 
 		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'QTDIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_QT_LYBRARY}' 
-		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'VTK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_VTK_LYBRARY}\\\\lib\\\\vtk-5.8' 
+		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'VTK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_VTK_LYBRARY}\\\\lib\\\\vtk-5.10' 
 		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'WXWIN' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_WXWIN_LYBRARY}' 
 		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'XERCES_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_XERCES_LYBRARY}' 
 		#WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'KWWidgets_dir' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_KWWIDGETS_LYBRARY}\\\\lib\\\\KWWidgets'