From 5201a716e21229a5ec4e043be075b92282146c2b Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Mon, 19 Dec 2011 17:09:52 +0000 Subject: [PATCH] DFCH: Thirdpartylibs update --- .../scripts/install_thirdparty_dlls_cmake.bat | 10 ++++++++++ .../scripts/install_thirdparty_libraries_cmake.bat | 10 ++++++++++ Install_ThirdParty/scripts/move_thirdparty_dlls.bat | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat index 0598331..c1929dc 100644 --- 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 d519734..576822a 100644 --- 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 e1f7507..5aea0bc 100644 --- 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------------------ -- 2.47.1