From c0f206d129fd7815c8feb21ec0d3efeca985230d Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Wed, 26 Oct 2011 16:31:01 +0000 Subject: [PATCH] DFCH: Script bugs solved!! --- .../scripts/install_thirdparty_all.bat | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat index ca4fd01..1d94281 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_all.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat @@ -53,11 +53,11 @@ set installpath=%thirdpartyGeneration%\thirdparty_install set binpath=%thirdpartyGeneration%\thirdparty_bin set sourcepath=%thirdpartyGeneration%\thirdparty_source -set qt=Qt -set wxWidgets=wxWidgets -set boost=Boost -set xercesc=xerces -set itk=ITK +set qt=Qt-4.7.3 +set wxWidgets=wxWidgets-2.9.2 +set boost=Boost-1.47.0 +set xercesc=xerces-c-3.1.1 +set itk=InsightToolkit-3.20.0 set gdcm=gdcm set vtk=VTK @@ -101,7 +101,6 @@ echo ----------------------------------- call %vcvarsall% - echo ----------------------------------- echo -------Creating Folders------------ echo ----------------------------------- @@ -229,7 +228,7 @@ del InsightToolkit-3.20.0.zip echo ----------Installing--------------- cd %binpath% -mkdir %itk%Bin +echo 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 @@ -259,8 +258,6 @@ msbuild /p:Configuration=%buildType% INSTALL.vcxproj echo -----End XERCES Installation------- - - echo ----------------------------------- echo -------VTK Installation------------ echo ----------------------------------- @@ -275,6 +272,7 @@ del %thirdpartyGeneration%\thirdparty_source\VTK-5.8.0.tar echo ----------Installing--------------- + cd %binpath% mkdir %vtk%Bin cd %vtk%Bin @@ -285,7 +283,6 @@ 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 ----------------------------------- @@ -320,10 +317,10 @@ echo ----------------------------------- echo -------TTH Installation------------ echo ----------------------------------- echo ----------Extracting--------------- +cd %sourcepath% %zipPath% x tth_exe.zip rename tth_exe tth del tth_exe.zip echo ------End TTH Installation--------- - cd c:\ @echo on \ No newline at end of file -- 2.47.1