DFCH: Thirdpartylibs update

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index 0598331da8145f274adda7c6765bc03a6d250b0d..c1929dc60d78127752e8ce3f4679eee73c64efaf 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -17,6 +17,7 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 echo ----End Asking Architecture--------
 
 set thirdpartyGeneration=%1
+set version="3.0.1-win32"
 
 set thirdparty_cmake=%cd%\..\cmake
 
@@ -48,4 +49,13 @@ cmake CMakeCache.txt
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 msbuild /p:Configuration=release PACKAGE.vcxproj
 
+set installerPath="%thirdpartydllspath%\thirdparty_bin\crea_ThirdParty_dlls_Bin\crea_ThirdParty_dlls-%version%.exe"
+
+if exist installerPath (
+mkdir %thirdpartyGeneration%\thirdparty_installers
+move /Y %installerPath% %thirdpartyGeneration%\thirdparty_installers
+rmdir %binpath% /s /q
+rmdir %thirdpartydllspath% /s /q
+)
+
 exit /B
\ No newline at end of file

diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
index d519734e316ee1b8643d28a1d43015e78fa04007..576822a5470c369c02570adbd49eee6db9b5da23 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -17,6 +17,7 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 echo ----End Asking Architecture--------
 
 set thirdpartyGeneration=%1
+set version="3.0.1-win32"
 
 set thirdparty_cmake=%cd%\..\cmake
 
@@ -47,4 +48,13 @@ cmake CMakeCache.txt
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 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

diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
index e1f7507d143ca8203044789d37db7d1d6f52244a..5aea0bcd546b1df71f61eb3d0ff330043d7cd94d 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
@@ -131,8 +131,8 @@ echo -----------------------------------
 echo -------------VTK-------------------
 echo -----------------------------------
 
-echo copy /V /Y %VTKINSTALLDIR%\bin\*.exe %creaThirdPartydlls%
-echo copy /V /Y %VTKINSTALLDIR%\bin\*.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\*.exe %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\*.dll %creaThirdPartydlls%
 
 echo -----------------------------------
 echo -------------GDCM------------------