*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 070425ea1451c22996d2cc12d3d843e7f20815f9..a938d1ac2c656ee4d1262af9c074d7b932fa3a5d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,8 @@ PROJECT(crea_ThirdParty_Libraries)
 
 #==================================
 # The project version
-SET(PROJECT_MAJOR_VERSION 2)
-SET(PROJECT_MINOR_VERSION 1)
+SET(PROJECT_MAJOR_VERSION 3)
+SET(PROJECT_MINOR_VERSION 0)
 SET(PROJECT_BUILD_VERSION 0)
 #==================================
 

diff --git a/README.txt b/README.txt
index 30da6e3e5b92501f632c1d6fae76d9c85853fd7d..f2f2cb63f603d395dea216b4278657d7d2042280 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,2 +1,39 @@
-creaEnvironment
+creaThirdPartyLibraries
+
+To use this project you must compile each of the following libraries, if possible compile them in release and debug mode
+
+wxWidgets
+       http://www.wxwidgets.org/downloads/
+VTK
+       http://www.vtk.org/get-software.php
+ITK
+       http://www.itk.org/HTML/Download.htm
+GDCM
+       checkout from cvs
+QT
+       http://www.qtsoftware.com/downloads     
+Boost
+       http://www.boost.org/users/download/
+       
+
+when you finish compiling this libraries choose a common install directory and use the install mechanism for each library
+for the libraries that do not have a install mechanism, copy the headers directory and the directory where the *.lib and *.dll 
+were created.
+
+After doing this you must have in the choosen directory all of the libraries. 
+Run a search process in the directory for all dlls (*.dll), by doing this your result will show all of the dlls from the libraries
+cut and paste all of the dlls in a different directoy (this will be useful when generating creaThirdPartyDlls).
+
+Run the cmake file configuration and give the installation directory to the configuration.
+
+Run in visual Studio the package configuration
+
+A installer must be created with all the contents of the installation directory.
+
+
+In case of adding a new library, follow the same process and check the CMakeLists.txt file in the installation directory, 
+you might need to check the environment variables each library uses so they can be added in the installation process
+
+End
+
 (c) CREATIS-LRMN 2008
\ No newline at end of file

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 6fa308991bfa66c1ede63e10dad2a80bbd4a90d1..73a0cd5f005be0e7e819a6e0a3fd80f4526d19d5 100644 (file)
--- 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)