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=d6b08558371833abab72657cb3825bd6ae16f08b;hb=76af7cfcfd5295c4b23954d3c0cfb0d1c1210bcc;hp=cb2116f1e74239b0c177cfaa1961a4882791f2c9;hpb=7c7181bc9b1ac202817b9d02c64807dc685590ef;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index cb2116f..d6b0855 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -22,8 +22,6 @@ set buildType=%2
 set x86Comp=%3
 
 
-set version="3.0.1-win32"
-
 set thirdparty_cmake=%cd%\..\cmake
 
 set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
@@ -31,7 +29,6 @@ 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\%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"
 if not exist %vcvarsall% (
@@ -41,39 +38,41 @@ if not exist %vcvarsall% (
 
 if %x86Comp%==ON (
 	call %vcvarsall%
+	set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_dlls"
 	echo "Compilation forced x86"
 ) else (
 	if %PROCESSOR_ARCHITECTURE%==x86 (
 		call %vcvarsall%
+		set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_dlls"
 	) else (
 		call %vcvarsall% amd64
+		set installpath="%ProgramFiles%\creatools\crea_ThirdParty_dlls"
 	)
 )
 
+rmdir /S /Q %binpath%
 mkdir %binpath%
 cd %binpath%
 
 if %x86Comp%==ON (
+	set buildPlatform=win32
 	cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
 ) else (
 	if %PROCESSOR_ARCHITECTURE%==x86 (
+		set buildPlatform=win32
 		cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
 	) else (
+		set buildPlatform=win64
 		cmake -G"Visual Studio 10 Win64"  -H%sourcepath% -B%binpath%
 	)
 )
 
+cmake -D CREATOOLS_BUILDTYPE:STRING=%buildType% -D CREATOOLS_PLATFORM:STRING=%buildPlatform%  CMakeCache.txt
 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 /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