From b8d6cd0ed02f7fa48883418fff725fa444aac779 Mon Sep 17 00:00:00 2001
From: Diego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Date: Tue, 11 Oct 2011 14:00:31 +0000
Subject: [PATCH] DFCH Last update install.bat (GDCM is now working) :)

---
 .../scripts/install_thirdparty_all.bat        | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 86e05f5..48ba2d0 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -37,15 +37,19 @@ set itk=InsightToolkit-3.20.0
 set gdcm=gdcm
 set vtk=VTK
 
+set QTDIR=%thirdpartyGeneration%\thirdparty_source\Qt\4.7.3\
+set WXDIR=%thirdpartyGeneration%\thirdparty_source\wxWidgets\2.9.2\
+set BOOSTDIR=%thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\
+
+
 @echo off
 echo ---End Setting Global Variables----
 echo -----------------------------------
 @echo on
 call %vcvarsall%
 
-
-
 @echo off
+
 echo -----------------------------------
 echo -------Creating Folders------------
 echo -----------------------------------
@@ -72,19 +76,16 @@ cd %thirdpartyGeneration%\thirdparty_source\
 %wgetPath% %urlCreatisSource%/boost_1_47_0.7z
 %wgetPath% %urlCreatisSource%/vtk-5.8.0.tar.gz
 %wgetPath% %urlCreatisSource%/InsightToolkit-3.20.0.zip
-%wgetPath% %urlCreatisSource%/gdcm.tar.gz
+%wgetPath% %urlCreatisSource%/gdcm_11_Oct_2011.tar.gz
 %wgetPath% %urlCreatisSource%/xerces-c-3.1.1.zip
 
 @echo off
 echo ------End Downloading Sources------
 
+
 echo -----------------------------------
 echo --------Qt Installation------------
 echo -----------------------------------
-echo ---Setting Enviroment Variables----
-@echo on
-set QTDIR=%thirdpartyGeneration%\thirdparty_source\Qt\4.7.3\
-@echo off
 echo ----------Extracting---------------
 @echo on
 cd %thirdpartyGeneration%\thirdparty_source\
@@ -109,10 +110,6 @@ echo ------End QT Installation----------
 echo -----------------------------------
 echo -----wxWidgets Installation--------
 echo -----------------------------------
-echo -------Setting Variables-----------
-@echo on
-set WXDIR=%thirdpartyGeneration%\thirdparty_source\wxWidgets\2.9.2\
-@echo off
 echo ----------Extracting---------------
 @echo on
 cd %thirdpartyGeneration%\thirdparty_source
@@ -132,10 +129,6 @@ echo ----End wxWidgets Installation-----
 echo -----------------------------------
 echo ------Boost Installation-----------
 echo -----------------------------------
-echo -------Setting Variables-----------
-@echo on
-set BOOSTDIR=%thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\
-@echo off
 echo ----------Extracting---------------
 @echo on
 cd %thirdpartyGeneration%\thirdparty_source\
@@ -210,14 +203,16 @@ msbuild /p:Configuration=%buildType% INSTALL.vcxproj
 @echo off
 echo -----End XERCES Installation-------
 
+
+
 echo -----------------------------------
 echo -------VTK Installation------------
 echo -----------------------------------
 echo ----------Extracting---------------
 @echo on
 cd %thirdpartyGeneration%\thirdparty_source\
-%zipPath% x %thirdpartyGeneration%\thirdparty_source\VTK-5.6.1.patchCreatis.tar.gz
-%zipPath% x %thirdpartyGeneration%\thirdparty_source\VTK-5.6.1.patchCreatis.tar
+%zipPath% x %thirdpartyGeneration%\thirdparty_source\VTK-5.8.0.tar.gz
+%zipPath% x %thirdpartyGeneration%\thirdparty_source\VTK-5.8.0.tar
 cd %thirdpartyGeneration%\thirdparty_source\VTK
 del %thirdpartyGeneration%\thirdparty_source\VTK-5.8.0.tar.gz
 del %thirdpartyGeneration%\thirdparty_source\VTK-5.8.0.tar
@@ -240,19 +235,20 @@ echo ------End VTK Installation---------
 echo -----------------------------------
 echo -------GDCM Installation-----------
 echo -----------------------------------
-echo -------Setting Variables-----------
 echo ----------Extracting---------------
 @echo on
 cd %thirdpartyGeneration%\thirdparty_source
-%zipPath% x gdcm.tar.gz
-%zipPath% x gdcm.tar
-del gdcm.tar.gz
-del gdcm.tar
+%zipPath% x gdcm_11_Oct_2011.tar.gz
+%zipPath% x gdcm_11_Oct_2011.tar
+del gdcm_11_Oct_2011.tar.gz
+del gdcm_11_Oct_2011.tar
 @echo off
 echo ----------Installing---------------
 @echo on
+
 cd  %binpath%
 mkdir %gdcm%Bin
+
 cd %gdcm%Bin
 cmake -G"Visual Studio 10"  -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin
 cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%gdcm%\ CMakeCache.txt
-- 
2.47.0