]> Creatis software - creaToolsTools.git/blobdiff - Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
Bug #1908
[creaToolsTools.git] / Install_ThirdParty / scripts / install_thirdparty_libraries_cmake.bat
index 48da8b58bd616fe1c51f6ebe615dea54eeb75529..63436005600c5a686f4feb8823fe587447d1875f 100644 (file)
@@ -21,8 +21,6 @@ set buildType=%2
 ::The following line is to force x86 or x64 compilation
 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"
@@ -30,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% (
@@ -43,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%
 
@@ -68,11 +68,4 @@ 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\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