X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=73a0cd5f005be0e7e819a6e0a3fd80f4526d19d5;hb=e42695d02bad48ce91d501e1d4d12b26ac97e2ee;hp=6fa308991bfa66c1ede63e10dad2a80bbd4a90d1;hpb=06854a891cdf72a53131bc47aecf5575992ce985;p=crea_ThirdParty_Libraries.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 6fa3089..73a0cd5 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -49,11 +49,14 @@ IF(WIN32 AND NOT UNIX)
   SET(CPACK_NSIS_MODIFY_PATH OFF)
 
 
-  set  (CREA_ITK_LYBRARY         itk-3.10.1 )
-  set  (CREA_VTK_LYBRARY         vtk-5.2.1 )
-  set  (CREA_GDCM_LYBRARY        gdcm-090109 )
-  set  (CREA_WXWIN_LYBRARY       wxWidgets-2.8.9)
-  set  (CREA_KWWIDGETS_LYBRARY   KWWidgets-090109 )
+  set  (CREA_BOOST_LYBRARY	boost-1.40.0)
+  set  (CREA_GDCM_LYBRARY	gdcm110909 )
+  set  (CREA_ITK_LYBRARY	itk-3.14.0 )
+  set  (CREA_QT_LYBRARY		Qt4.5.2 )
+  set  (CREA_VTK_LYBRARY	vtk-5.4.2 )  
+  set  (CREA_WXWIN_LYBRARY	wxWidgets-2.8.10)
+  
+  #set  (CREA_KWWIDGETS_LYBRARY   KWWidgets-090109 )
   
   set  (MessageLibraryPath "CREA_LIBRARY_DESTINATION_PATH (itk,vtk,gdcm,wx,KWWidgets)")
   set  (CREA_LIBRARY_SOURCE_PATH  "" CACHE PATH ${MessageLibraryPath} )
@@ -66,14 +69,17 @@ IF(WIN32 AND NOT UNIX)
   
   
    SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS  "
-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' 'VTK_DIR' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_VTK_LYBRARY}\\\\lib\\\\vtk-5.2' 
+WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'BOOST_ROOT' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_BOOST_LYBRARY}' 
 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.4' 
 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' 'KWWidgets_dir' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_KWWIDGETS_LYBRARY}\\\\lib\\\\KWWidgets' 
+
+
 SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 
 ")
-
+#WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'KWWidgets_dir' '$INSTDIR\\\\${CREA_LIBRARY_DESTINATION_PATH}\\\\${CREA_KWWIDGETS_LYBRARY}\\\\lib\\\\KWWidgets' 
 
 ELSE(WIN32 AND NOT UNIX)
 #  SET(CPACK_STRIP_FILES "bin/bbi")
@@ -88,11 +94,14 @@ INCLUDE(CPack)
 # Aditional INSTALL for CPACK mecanism.
 IF (WIN32)
 
-INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_VTK_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_GDCM_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_KWWIDGETS_LYBRARY} DESTINATION ${CREA_LIBRARY_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_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_KWWIDGETS_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
 
 ENDIF (WIN32)