From e05d1e9431d89925bbfa483ad91732b1dac24749 Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Fri, 16 Sep 2011 14:45:16 +0000 Subject: [PATCH] DFCH: Last modifications of the script (Boost working) --- .../scripts/install_thirdparty_all.bat | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat index 239c1a6..3232565 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_all.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat @@ -60,8 +60,8 @@ cd %thirdpartyGeneration%\thirdparty_source\ %wgetPath% %urlCreatisSource%/qt-4.7.3.zip %wgetPath% %urlCreatisSource%/wxWidgets-2.9.2.7z %wgetPath% %urlCreatisSource%/boost_1_47_0.7z -%wgetPath% %urlCreatisSource%/vtk-5.6.1.patchCreatis.tar.gz -%wgetPath% %urlCreatisSource%/InsightToolkit-3.20.0.patchCreatis.tar.gz +%wgetPath% %urlCreatisSource%/vtk-5.6.1.zip +%wgetPath% %urlCreatisSource%/InsightToolkit-3.20.0.zip %wgetPath% %urlCreatisSource%/gdcm_05_Mai_2011.tar.gz %wgetPath% %urlCreatisSource%/xerces-c-3.1.1.zip rem ------End Downloading Sources------ @@ -127,6 +127,7 @@ if %PROCESSOR_ARCHITECTURE%==x86 ( @echo off ) else ( @echo on +cd stage b2.exe --toolset=msvc-10.0 --build-type=complete architecture=x86 address-model=64 stage @echo off ) @@ -155,26 +156,6 @@ msbuild /p:Configuration=%buildType% INSTALL.vcxproj cd c:\ rem ------End VTK Installation--------- -rem ----------------------------------- -rem -------ITK Installation------------ -rem ----------------------------------- -rem ----------Extracting--------------- -cd %thirdpartyGeneration%\thirdparty_source -%zipPath% x InsightToolkit-3.20.0.zip -del InsightToolkit-3.20.0.zip -rem ----------Installing--------------- -cd %binpath% -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 CMakeCache.txt -FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType% -msbuild /p:Configuration=%buildType% INSTALL.vcxproj -cd c:\ -rem ------End ITK Installation--------- - rem ----------------------------------- rem -------GDCM Installation----------- rem ----------------------------------- @@ -198,6 +179,26 @@ msbuild /p:Configuration=%buildType% INSTALL.vcxproj cd c:\ rem -----End GDCM Installation--------- +rem ----------------------------------- +rem -------ITK Installation------------ +rem ----------------------------------- +rem ----------Extracting--------------- +cd %thirdpartyGeneration%\thirdparty_source +%zipPath% x InsightToolkit-3.20.0.zip +del InsightToolkit-3.20.0.zip +rem ----------Installing--------------- +cd %binpath% +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 CMakeCache.txt +FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType% +msbuild /p:Configuration=%buildType% INSTALL.vcxproj +cd c:\ +rem ------End ITK Installation--------- + rem ----------------------------------- rem ------XERCES Installation---------- rem ----------------------------------- -- 2.45.1