X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_libraries_cmake.bat;h=2f5f5b45ef590814bb44e5a5ad5cea1aeee925c1;hb=d2694504db1df749aaf7647fb5ddc69c5dbe0c52;hp=2c4946d45a0735fb4f95497e96e2a158d69a8d87;hpb=a465a7043637b6a247633b58510cd3a5d3a3038c;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
index 2c4946d..2f5f5b4 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -28,7 +28,6 @@ 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\%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"
 if not exist %vcvarsall% (
@@ -41,25 +40,32 @@ if %x86Comp%==ON (
 	echo "Compilation forced x86"
 ) else (
 	if %PROCESSOR_ARCHITECTURE%==x86 (
+		set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_Libraries"
 		call %vcvarsall%
 	) else (
+		set installpath="%ProgramFiles%\creatools\crea_ThirdParty_Libraries"
 		call %vcvarsall% amd64
 	)
 )
 
+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_SOURCE_PATH:PATH=%thirdpartylibpath% CMakeCache.txt
 cmake CMakeCache.txt