From: Diego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Date: Tue, 12 Jun 2012 11:50:35 +0000 (+0000)
Subject: DFCH: Update compilation (use all procesors in compilation)
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=be9323e35ba1081cc4d260388182ffbff3136869;p=creaToolsTools.git

DFCH: Update compilation (use all procesors in compilation)
---

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 2a25732..86e9058 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -92,7 +92,7 @@ set QMAKESPEC=win32-msvc2010
 
 echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp
 
-%JOMDIR%\jom.exe -j 8
+%JOMDIR%\jom.exe -j %NUMBER_OF_PROCESSORS%
 
 cd C:\
 
@@ -113,7 +113,7 @@ mkdir %installpath%\%boost%
 cd %sourcepath%\%boost%
 
 call bootstrap.bat
-bjam.exe -j 8 --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared --prefix=%installpath%\%boost% install
+bjam.exe -j %NUMBER_OF_PROCESSORS% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared --prefix=%installpath%\%boost% install
 cd C:\
 
 
@@ -128,8 +128,8 @@ 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 /m:8 /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
-msbuild /m:8 /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj
 cd c:\
 
 echo -----------------------------------
@@ -144,17 +144,17 @@ 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 /m:8 /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
-msbuild /m:8 /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj
 cd c:\
 
 echo -----------------------------------
 echo ------XERCES Installation----------
 echo -----------------------------------
 cd  %sourcepath%\%xercesc%\projects\Win32\VC10\xerces-all
-FOR /R %%a IN (*.sln) DO msbuild %%a /m:8 /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
-FOR /R %%a IN (*.sln) DO msbuild %%a /m:8 /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
-msbuild /m:8 /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj
 
 echo -----------------------------------
 echo -------GDCM Installation-----------
@@ -168,8 +168,8 @@ 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=%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 /m:8 /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
-msbuild /m:8 /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj
 cd c:\
 
 echo -----------------------------------
diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index aa2f07b..abb2613 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -46,8 +46,8 @@ cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
 cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt
 cmake -D CREA_LIBRARY_DLL_PATH:PATH=%thirdpartydllspath% CMakeCache.txt
 cmake CMakeCache.txt
-FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
-msbuild /p:Configuration=release PACKAGE.vcxproj
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% PACKAGE.vcxproj
 
 set installerPath="%thirdpartydllspath%\thirdparty_bin\crea_ThirdParty_dlls_Bin\crea_ThirdParty_dlls-%version%.exe"
 
diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
index 0f5b872..e54703f 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -45,8 +45,8 @@ cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
 cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt
 cmake -D CREA_LIBRARY_SOURCE_PATH:PATH=%thirdpartylibpath% CMakeCache.txt
 cmake CMakeCache.txt
-FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
-msbuild /p:Configuration=release PACKAGE.vcxproj
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% PACKAGE.vcxproj
 
 set installerPath="%thirdpartydllspath%\thirdparty_bin\creaTPLBin\crea_ThirdParty_Libraries-%version%.exe"