From: Eduardo Enrique Davila Serrano Date: Tue, 27 Sep 2022 08:53:07 +0000 (+0200) Subject: 3450 vtk9itk5wx3-macos X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1e2644acb4be55475f718401a99d4d70d9c43891;p=creaToolsTools.git 3450 vtk9itk5wx3-macos --- diff --git a/Install_mingw64/Install_CreaTools/scripts/Tool-scpCreaToolsToTux.bat b/Install_mingw64/Install_CreaTools/scripts/Tool-scpCreaToolsToTux.bat index 00edd88..0d00e13 100644 --- a/Install_mingw64/Install_CreaTools/scripts/Tool-scpCreaToolsToTux.bat +++ b/Install_mingw64/Install_CreaTools/scripts/Tool-scpCreaToolsToTux.bat @@ -1,5 +1,5 @@ ssh-add -scp crea_TPdlls--4.1.0-win64.exe davila@tux.creatis.insa-lyon.fr:/home/davila/creatools/crea_ThirdParty_dlls/v4.x.x/ -scp CreaTools-Release-4.1.0-win64.exe davila@tux.creatis.insa-lyon.fr:/home/davila/creatools/creaTools/v4.x.x/ +scp crea_TPdlls--4.1.0-win64.exe davila@tux.creatis.insa-lyon.fr:/home/davila/creatools/crea_ThirdParty_dlls/v5.x.x/ +scp CreaTools-Release-4.1.0-win64.exe davila@tux.creatis.insa-lyon.fr:/home/davila/creatools/creaTools/v5.x.x/ pause diff --git a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat index bf57c4b..0ce7fbd 100644 --- a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat +++ b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat @@ -32,7 +32,7 @@ echo downloading creatools software :SkipEED1 ::set creatoolsBranch=vtk8itk5wx3-mingw64 -set creatoolsBranch=vtk8itk5wx3-macos +set creatoolsBranch=vtk9itk5wx3-macos echo echo tmp.sh > tmp.sh diff --git a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt index 2853dae..169a337 100644 --- a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt +++ b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt @@ -2,8 +2,8 @@ PROJECT(crea_TPdlls) cmake_minimum_required(VERSION 2.6) -SET(PROJECT_MAJOR_VERSION 4) -SET(PROJECT_MINOR_VERSION 1) +SET(PROJECT_MAJOR_VERSION 5) +SET(PROJECT_MINOR_VERSION 0) SET(PROJECT_BUILD_VERSION 0) SET(CREA_VERBOSE_CMAKE TRUE) diff --git a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat index d4484ae..1cd476f 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat @@ -72,11 +72,13 @@ set XERCESFNAME=xerces-c-3.2.3.zip :: set VTKFNAME=VTK-8.1.1-patch_mingw64.7z set VTKFNAME=VTK-8.1.1-Patch.7z :: set VTKFNAME=VTK-8.2.0-Patch-TDx.zip +set VTKFNAME=VTK-9.2.0.rc1-Patch-2022-08-04.zip ::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_2019_06_17_vtk8.zip +::set GDCMFNAME=gdcm13_2019_06_17_vtk8.zip +set GDCMFNAME=gdcm13_2022_07_21_vtk92.zip set TTHFNAME=tth_exe.zip set SQLITEFNAME=sqlite_v3.6.23.1.zip @@ -246,10 +248,12 @@ rename wxWidgets_%WXVERSION% wxWidgets rename boost_1_69_0 boost rename InsightToolkit-5.0.1 itk -rename VTK-8.1.1 vtk :: rename VTK-8.2.0-Patch-TDx vtk +rename VTK-9.2.0.rc1 vtk + +:: rename gdcm13_2018_05_28_vtk8 gdcm13 +rename gdcm13 gdcm13 -rename gdcm13_2018_05_28_vtk8 gdcm13 rename tth_exe tth rename xerces-c-3.2.3 xerces rename sqlite_v3.6.23.1 sqlite diff --git a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat index bf1a395..f4eb776 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat @@ -241,8 +241,16 @@ cd %vtk%Bin %cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin >> %LogFolder%\VTKInstall.log 2>&1 %cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 -%cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 -%cmakeBin% -D VTK_Group_Views:BOOL=ON CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 +:: %cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 +:: %cmakeBin% -D VTK_Group_Views:BOOL=ON CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 +%cmakeBin% -D CMAKE_INSTALL_LIBDIR:STRING="lib" CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 + +:: https://discourse.vtk.org/t/vtk-9-1-mingw64-and-windows-10/7116/21 +%cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fcommon" CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 +%cmakeBin% -D CMAKE_C_FLAGS:STRING="-fcommon" CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 +%cmakeBin% -D CMAKE_EXE_LINKER_FLAGS:STRING="-fcommon" CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 + + mingw32-make.exe -j%NUMBER_OF_PROCESSORS% >> %LogFolder%\VTKInstall.log 2>&1 mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install >> %LogFolder%\VTKInstall.log 2>&1 diff --git a/Install_mingw64/Install_ThirdParty/scripts/makeAll.bat b/Install_mingw64/Install_ThirdParty/scripts/makeAll.bat index e13e4ce..7bcd7f1 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/makeAll.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/makeAll.bat @@ -19,7 +19,6 @@ date /T set scripts=%cd%\scripts set LogFolder=%thirdpartyGeneration%\installLog - if %EEDclean%==FALSE GOTO SKIPCLEAN cd %scripts% echo cleaning All diff --git a/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat index 1ce5ffd..e8c2cdb 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=TRUE +set EEDclean=FALSE set EEDcleanSOURCES=TRUE set EEDcleanBIN=TRUE set EEDcleanINSTALL=TRUE set EEDcleanLOGS=TRUE -set EEDdownload=TRUE +set EEDdownload=FALSE set EEDdownloadQT=FALSE set EEDdownloadWXWINDOWS=TRUE set EEDdownloadBOOST=TRUE @@ -18,7 +18,7 @@ set EEDdownloadDLFCN=TRUE set EEDdownloadTTH=TRUE set EEDdownloadOPENGLMESA=TRUE -set EEDinstall=TRUE +set EEDinstall=FALSE set EEDinstallQT=FALSE set EEDinstallWXWIDGETS=TRUE set EEDinstallBOOST=TRUE diff --git a/Install_mingw64/Readme_EED.txt b/Install_mingw64/Readme_EED.txt index 74869ab..9deeeb3 100644 --- a/Install_mingw64/Readme_EED.txt +++ b/Install_mingw64/Readme_EED.txt @@ -26,6 +26,7 @@ 2. Clone creaToolsTools -Cambiar la branch (vtk8itk5wx3-macos) -En creaToolsTools\creaToolsTools\Install_mingw64\config_win.bat ajustar el path de: + baseProject cmakeBin thirdpartyGenerationBase wget @@ -65,7 +66,7 @@ opcion de clean y download se renombran los source automatidacmente (OJO con wx 4. Copiar .......\C11\creaToolsTools\Install_mingw64\Install_CreaTools\scripts\Tool-scpCreaToolsToTux.bat A la altura de la .......\C11 - + (verition verification ex: v5.x.x) ================================================================= diff --git a/Install_mingw64/config_win.bat b/Install_mingw64/config_win.bat index c04ff77..bca0364 100644 --- a/Install_mingw64/config_win.bat +++ b/Install_mingw64/config_win.bat @@ -1,14 +1,14 @@ ::--------- Cumputer 3 : Tour Cratools 2 ------------------------- -set baseProject=C:\Users\davila\Creatis\C11 +set baseProject=C:\Users\davila\Creatis\C22 set cmakeBin=C:\Users\davila\Creatis\crea_Developper_Tools\cmake-3.17.1-win64-x64\bin\cmake.exe set ProgramFiles=C:\Program Files (x86) set wgetPath="C:\Users\davila\Creatis\crea_Developper_Tools\wget\wget.exe" set zipPath="C:\Program Files\7-Zip\7z.exe" ::set zipPath="peazip -ext2here " -set DirMingwDlls=C:\Users\davila\Creatis\crea_Developper_Tools\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin - +set DirMingwDlls=C:\Users\davila\Creatis\ups\mingw64\bin +::set DirMingwDlls=C:\Users\davila\Creatis\crea_Developper_Tools\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin ::--------- Cumputer 1 : Tour Cratools -------------------------