DFCH: Update compilation (use all procesors in compilation)

[creaToolsTools.git] / Install_ThirdParty / scripts / install_thirdparty_libraries_cmake.bat

diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
index 886da926e111d149e43092f81a55473dce63b487..e54703f48afc83129a835d3d601f0fa5bea04347 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -17,6 +17,9 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 echo ----End Asking Architecture--------
 
 set thirdpartyGeneration=%1
+set buildType=%2
+
+set version="3.0.1-win32"
 
 set thirdparty_cmake=%cd%\..\cmake
 
@@ -24,7 +27,7 @@ set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.
 
 set thirdpartylibpath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_libraries
 set sourcepath=%thirdparty_cmake%\crea_ThirdParty_Libraries
-set binpath=%thirdpartyGeneration%\thirdparty_bin\creaTPLBin
+set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%\creaTPLBin
 set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_Libraries"
 
 if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
@@ -35,8 +38,6 @@ if not exist %vcvarsall% (
 
 call %vcvarsall%
 
-rmdir %binpath% /s /q
-
 mkdir %binpath%
 cd %binpath%
 
@@ -44,6 +45,14 @@ 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
-@echo on
\ No newline at end of file
+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"
+
+if exist installerPath (
+mkdir %thirdpartyGeneration%\thirdparty_installers
+move /Y %installerPath% %thirdpartyGeneration%\thirdparty_installers
+)
+
+exit /B
\ No newline at end of file