X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_libraries_cmake.bat;h=576822a5470c369c02570adbd49eee6db9b5da23;hb=baa0516e21e1f4a6a838b48f008e9e60d6fb84d3;hp=8ce08153f8803ca4e2779e7cb1c94739e5d2f766;hpb=797e58f7171811248ae386e0d2df77e465750bb1;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
index 8ce0815..576822a 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -1,5 +1,9 @@
 @echo off
 echo -----------------------------------
+echo -----Generating Installers of------
+echo -----creaThirdPartyLibraries-------
+echo -----------------------------------
+echo -----------------------------------
 echo ------Asking Architecture----------
 echo -----------------------------------
 if %PROCESSOR_ARCHITECTURE%==x86 (
@@ -12,16 +16,17 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 
 echo ----End Asking Architecture--------
 
+set thirdpartyGeneration=%1
+set version="3.0.1-win32"
 
-set thirdpartylib_cmake=%1
-set thirdpartylibpath=%2
+set thirdparty_cmake=%cd%\..\cmake
 
 set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
 
-set sourcepath=%thirdpartylib_cmake%\crea_ThirdParty_Libraries
-set binpath=%thirdpartylib_cmake%\crea_ThirdParty_Libraries_Bin
-set installpath="C:\Temp\creatools\crea_ThirdParty_Libraries"
-echo set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_Libraries"
+set thirdpartylibpath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_libraries
+set sourcepath=%thirdparty_cmake%\crea_ThirdParty_Libraries
+set binpath=%thirdpartyGeneration%\thirdparty_bin\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% (
@@ -31,12 +36,25 @@ if not exist %vcvarsall% (
 
 call %vcvarsall%
 
+rmdir %binpath% /s /q
+
 mkdir %binpath%
 cd %binpath%
+
 cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
 cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt
 cmake -D CREA_LIBRARY_SOURCE_PATH:PATH=%thirdpartylibpath% 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
+
+set installerPath="%thirdpartydllspath%\thirdparty_bin\creaTPLBin\crea_ThirdParty_Libraries-%version%.exe"
+
+if exist installerPath (
+mkdir %thirdpartyGeneration%\thirdparty_installers
+move /Y %installerPath% %thirdpartyGeneration%\thirdparty_installers
+rmdir %binpath% /s /q
+rmdir %thirdpartylibpath% /s /q
+)
+
+exit /B
\ No newline at end of file