X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fcmake%2Fcrea_ThirdParty_Libraries%2Finstall%2FCMakeLists.txt;h=b7dcf2e1f00151433003e61e3ea9bf2fd8d8550a;hb=11c30fbd126b4a4c79ad39bb9ab2d5c22f6badbc;hp=7a82a097548cf9964a233dd494900e8289ba492b;hpb=4a364787d3f71bd8010767cd1b7ec3befda665f4;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 7a82a09..b7dcf2e 100644
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
@@ -16,6 +16,7 @@
 INCLUDE(InstallRequiredSystemLibraries)
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME} - CREATIS")
+SET(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-${CREATOOLS_BUILDTYPE}")
 SET(CPACK_PACKAGE_VENDOR "CREATIS")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt")
 SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
@@ -50,13 +51,13 @@ IF(WIN32 AND NOT UNIX)
 
 
   set  (CREA_BOOST_LYBRARY	boost)
-  set  (CREA_GDCM_LYBRARY	gdcm )
+  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)
-  set  (CREA_MIKATEX_LYBRARY miktex)
+  #DFCH -- set  (CREA_MIKATEX_LYBRARY miktex)
   
   #set  (CREA_KWWIDGETS_LYBRARY   KWWidgets-090109 )
   
@@ -92,7 +93,8 @@ IF (WIN32)
 	   )
 	ENDFOREACH(iLST)	
 	
-	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(FILES ${${CMAKE_PROJECT_NAME}_BINARY_DIR}/Version.txt DESTINATION . )
 	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} )
@@ -102,8 +104,10 @@ IF (WIN32)
 	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(CREATPL_DIRBIN "$INSTDIR")
+	 SET(CREATIS_THIRDPARTYLIBRARIES_DIRS ";") #DFCH
 
 	SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS  "	
 		WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\bin\\\\tth' 
@@ -130,11 +134,20 @@ IF (WIN32)
 		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' 
 
+		CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Version.txt.lnk'  '${CREATPL_DIRBIN}\\\\Version.txt' 
+		
 		SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 
 	")
 		
 		
 	SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS  "
+	
+	   		    !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+			Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Version.txt.lnk'
+			
+			StrCpy $MUI_TEMP '$SMPROGRAMS\\\\$MUI_TEMP'
+			RMDir /r $MUI_TEMP
+
 			!define Uninstall_EnvStr_RegKey 'HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\"'			
 			WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'CREATIS_THIRDPARTYLIBRARIES_DIRS' ''		
 			SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000