DFCH: Changes in boost compilation! :)

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 2ef43ea82c8caf57ee151fd934f9b810eb43de76..239c1a65d605331ade13f829aad22fb0cdbd725c 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -34,6 +34,7 @@ set xercesc=xerces-c-3.1.1
 set itk=InsightToolkit-3.20.0
 set gdcm=gdcm
 set vtk=VTK
+
 rem ---End Setting Global Variables----
 rem -----------------------------------
 
@@ -81,7 +82,7 @@ rem --------Renaming Folder------------
 rename qt-everywhere-opensource-src-4.7.3 4.7.3
 rem ----------Installing---------------
 cd 4.7.3
-echo y | configure -debug-and-release -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp
+echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp
 nmake
 cd C:\
 rem ------End QT Installation----------
@@ -99,8 +100,7 @@ cd wxWidgets\2.9.2
 del %thirdpartyGeneration%\thirdparty_source\wxWidgets-2.9.2.7z
 rem ----------Installing---------------
 cd %thirdpartyGeneration%\thirdparty_source\wxWidgets\2.9.2\build\msw
-nmake -f makefile.vc BUILD=debug UNICODE=1 SHARED=1
-nmake -f makefile.vc BUILD=release UNICODE=1 SHARED=1
+nmake -f makefile.vc BUILD=%buildType% UNICODE=1 SHARED=1
 cd C:\
 rem ----End wxWidgets Installation-----
 
@@ -119,10 +119,18 @@ rem --------Renaming Folder------------
 rename boost_1_47_0 1.47.0
 rem ----------Installing---------------
 cd %thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\
-md boost-build
-cd tools\build\v2
 call bootstrap.bat
-b2 -j 2 --build-dir=%thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\boost-build toolset=msvc --build-type=msvc install --prefix=%thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\boost-build
+@echo off
+if %PROCESSOR_ARCHITECTURE%==x86 (
+@echo on
+  b2.exe --toolset=msvc-10.0 --build-type=complete stage
+@echo off
+) else (
+@echo on
+  b2.exe --toolset=msvc-10.0 --build-type=complete architecture=x86 address-model=64 stage
+@echo off
+)
+@echo on
 cd C:\
 rem -----End Boost Installation--------
 
@@ -183,7 +191,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=%vtk% -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
+cmake -D VTK_DIR:PATH=%binpath%\%vtk%Bin -D GDCM_VTK:BOOL=ON -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
@@ -200,8 +208,8 @@ del xerces-c-3.1.1.zip
 rem ----------Installing---------------
 cd  %sourcepath%\%xercesc%\projects\Win32\VC10\xerces-all
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=build
-FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=release
-REM msbuild /p:Configuration=%buildType% INSTALL.vcxproj
+FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
+msbuild /p:Configuration=%buildType% INSTALL.vcxproj
 rem -----End XERCES Installation-------
 cd c:\
 pause