X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_libraries_cmake.bat;fp=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_libraries_cmake.bat;h=63436005600c5a686f4feb8823fe587447d1875f;hb=46fa7d8772214a9cf0a5ca8e208e400528e5e7c9;hp=2c4946d45a0735fb4f95497e96e2a158d69a8d87;hpb=202b0b1a7dc0552a8c4a9eb1c9c48b6866af6404;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..6343600 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,12 +40,15 @@ 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%