From bf56cf34759bfcb304ed733ce66084fb42fdc319 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Mon, 29 Jun 2020 21:10:35 +0200 Subject: [PATCH] Clean install --- .../cmake/crea_ThirdParty_dlls/install/CMakeLists.txt | 2 +- .../Install_ThirdParty/scripts/download_ThirdPartySW.bat | 2 +- .../Install_ThirdParty/scripts/tpl_variables.bat | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt index a6eda3d..3d79c03 100644 --- a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt +++ b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt @@ -101,7 +101,7 @@ IF(WIN32) #EED 19-11-2009 # SET(CREATIS_ENVIRONMENT_DIRS ";${CREA_DLLS_DIR};${MIKTEX_INSTALL_DIR}") - SET(CREATIS_THIRDPARTYDLLS_DIRS ";${CREA_DLLS_DIR}") + SET(CREATIS_THIRDPARTYDLLS_DIRS "${CREA_DLLS_DIR}") SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " diff --git a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat index 8fea02d..7e4c8b9 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat @@ -75,7 +75,7 @@ set VTKFNAME=VTK-8.1.1-Patch.7z ::set GDCMFNAME=gdcm_05_Mai_2011.tar ::set GDCMFNAME=gdcm_11_Oct_2011.tar ::set GDCMFNAME=gdcm_10_Mars_2017-vtk7.tar -set GDCMFNAME=gdcm13_2018_05_28_vtk8.zip +set GDCMFNAME=gdcm13_2019_06_17_vtk8.zip set TTHFNAME=tth_exe.zip set SQLITEFNAME=sqlite_v3.6.23.1.zip diff --git a/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat index e8c2cdb..1ce5ffd 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat @@ -1,11 +1,11 @@ -set EEDclean=FALSE +set EEDclean=TRUE set EEDcleanSOURCES=TRUE set EEDcleanBIN=TRUE set EEDcleanINSTALL=TRUE set EEDcleanLOGS=TRUE -set EEDdownload=FALSE +set EEDdownload=TRUE set EEDdownloadQT=FALSE set EEDdownloadWXWINDOWS=TRUE set EEDdownloadBOOST=TRUE @@ -18,7 +18,7 @@ set EEDdownloadDLFCN=TRUE set EEDdownloadTTH=TRUE set EEDdownloadOPENGLMESA=TRUE -set EEDinstall=FALSE +set EEDinstall=TRUE set EEDinstallQT=FALSE set EEDinstallWXWIDGETS=TRUE set EEDinstallBOOST=TRUE -- 2.47.1