DFCH: Bug

[creaToolsTools.git] / Install_ThirdParty / scripts / install_thirdparty_dlls_cmake.bat

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index 127d4430a207e0cd613a3ec8e95f9f1be934a1d6..0598331da8145f274adda7c6765bc03a6d250b0d 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -1,5 +1,9 @@
 @echo off
 echo -----------------------------------
+echo -----Generating Installers of------
+echo -------creaThirdPartyDlls----------
+echo -----------------------------------
+echo -----------------------------------
 echo ------Asking Architecture----------
 echo -----------------------------------
 if %PROCESSOR_ARCHITECTURE%==x86 (
@@ -12,17 +16,16 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 
 echo ----End Asking Architecture--------
 
-
-set thirdpartydllspath=%1
+set thirdpartyGeneration=%1
 
 set thirdparty_cmake=%cd%\..\cmake
 
 set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
 
+set thirdpartydllspath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_dlls
 set sourcepath=%thirdparty_cmake%\crea_ThirdParty_dlls
-set binpath=%thirdparty_cmake%\crea_ThirdParty_dlls_Bin
-set installpath="C:\Temp\creatools\crea_ThirdParty_dlls"
-echo set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_dlls"
+set binpath=%thirdpartyGeneration%\thirdparty_bin\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% (
@@ -32,7 +35,10 @@ if not exist %vcvarsall% (
 
 call %vcvarsall%
 
+rmdir %binpath% /s /q
+
 mkdir %binpath%
+
 cd %binpath%
 
 cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
@@ -40,5 +46,6 @@ 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 INSTALL.vcxproj
-@echo on
\ No newline at end of file
+msbuild /p:Configuration=release PACKAGE.vcxproj
+
+exit /B
\ No newline at end of file