DFCH: Uptating cmake, itk,vtk,gdcm and updating boos compilation.

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 1201bf9478a89073e1e1a65f90e1ecc61e2bb98e..ee93b89d3d9dcbde7b107ab7bbec1b47613fc755 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -210,6 +210,33 @@ cd C:\
 
 echo -----End Boost Installation--------
 
+echo -----------------------------------
+echo -------VTK Installation------------
+echo -----------------------------------
+echo ----------Extracting---------------
+
+cd %sourcepath%
+%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
+
+echo ----------Installing---------------
+
+
+cd  %binpath%
+mkdir %vtk%Bin
+cd %vtk%Bin
+cmake -G"Visual Studio 10"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin 
+cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%vtk%\ CMakeCache.txt
+cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
+cmake CMakeCache.txt
+FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
+msbuild /p:Configuration=%buildType% INSTALL.vcxproj
+cd c:\
+echo ------End VTK Installation---------
+
 echo -----------------------------------
 echo -------ITK Installation------------
 echo -----------------------------------
@@ -222,11 +249,11 @@ del InsightToolkit-3.20.0.zip
 echo ----------Installing---------------
 
 cd  %binpath%
-echo mkdir %itk%Bin
+mkdir %itk%Bin
 cd %itk%Bin
-cmake -G"Visual Studio 10" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin 
-cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%itk%\ -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
-cmake -D USE_DEBUG_LIB:BOOL=%buildType% CMakeCache.txt
+cmake -G"Visual Studio 10" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin
+cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%itk%\ CMakeCache.txt
+cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
 cmake CMakeCache.txt
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 msbuild /p:Configuration=%buildType% INSTALL.vcxproj
@@ -252,32 +279,7 @@ msbuild /p:Configuration=%buildType% INSTALL.vcxproj
 
 echo -----End XERCES Installation-------
 
-echo -----------------------------------
-echo -------VTK Installation------------
-echo -----------------------------------
-echo ----------Extracting---------------
-
-cd %sourcepath%
-%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
-
-echo ----------Installing---------------
-
 
-cd  %binpath%
-mkdir %vtk%Bin
-cd %vtk%Bin
-cmake -G"Visual Studio 10"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin 
-cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%vtk%\ CMakeCache.txt
-cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
-cmake CMakeCache.txt
-FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
-msbuild /p:Configuration=%buildType% INSTALL.vcxproj
-cd c:\
-echo ------End VTK Installation---------
 
 echo -----------------------------------
 echo -------GDCM Installation-----------
@@ -299,7 +301,7 @@ 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
-cmake -D VTK_DIR:PATH=%binpath%\%vtk%Bin -D GDCM_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
+cmake -D VTK_DIR:PATH=%installpath%\%vtk%\ -D GDCM_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
 cmake CMakeCache.txt
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 msbuild /p:Configuration=%buildType% INSTALL.vcxproj