X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_dlls_cmake.bat;h=2e791bfd03c414963e46751a714e309c4e9f7ec7;hb=67a0a4de0e7d0b76e4bd6e1727da7802bb77fcf7;hp=0598331da8145f274adda7c6765bc03a6d250b0d;hpb=706b0ca702c02384f0628497756f1cb9b1a4ed21;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index 0598331..2e791bf 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -17,6 +17,10 @@ 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 +28,7 @@ set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.
 
 set thirdpartydllspath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_dlls
 set sourcepath=%thirdparty_cmake%\crea_ThirdParty_dlls
-set binpath=%thirdpartyGeneration%\thirdparty_bin\crea_ThirdParty_dlls_Bin
+set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%\crea_ThirdParty_dlls_Bin
 set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_dlls"
 
 if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
@@ -33,19 +37,32 @@ if not exist %vcvarsall% (
   exit
 )
 
-call %vcvarsall%
-
-rmdir %binpath% /s /q
+if %PROCESSOR_ARCHITECTURE%==x86 (
+	call %vcvarsall%
+) else (
+	call %vcvarsall% amd64
+)
 
 mkdir %binpath%
-
 cd %binpath%
 
-cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+if %PROCESSOR_ARCHITECTURE%==x86 (
+	cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+) else (
+	cmake -G"Visual Studio 10 Win64"  -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"
+
+if exist installerPath (
+mkdir %thirdpartyGeneration%\thirdparty_installers
+move /Y %installerPath% %thirdpartyGeneration%\thirdparty_installers
+)
 
 exit /B
\ No newline at end of file