3450 vtk9itk5wx3-macos

diff --git a/Install_mingw64/Install_CreaTools/scripts/Tool-scpCreaToolsToTux.bat b/Install_mingw64/Install_CreaTools/scripts/Tool-scpCreaToolsToTux.bat
index 00edd88c47225ad65fe4e0bc66f3103872dc57aa..0d00e139919a748af165e02b5069bc9034839d22 100644 (file)
--- 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 bf57c4be0597c4b73dd2c865292bcda0dd033d63..0ce7fbd5fd357d576d0739e14d42e5f9c3d5b14f 100644 (file)
--- 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 2853daec4b7f729f54559fb1dc6d259ee0422243..169a3377808a0bd9a6048275343033836babd088 100644 (file)
--- 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 d4484ae3af6574346fa11dbc39ef1c6b1a2e16cf..1cd476f55c7c21fb210ffffc199762a3dd088ca4 100644 (file)
--- 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 bf1a395af2741b7310c8bd5bc67fe07e7600c7e4..f4eb7766b2cd5188308f530a0a4906e772f30101 100644 (file)
--- 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 e13e4ce228058e27ee2e4f856a5269f697b0fd63..7bcd7f1b05189e5009fea54fde6e3013cc36627e 100644 (file)
--- 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 1ce5ffd9c22cdb78357eb23873392d131e7a2d3c..e8c2cdb3f21cbefc87fd29759f1e9d49a4a403c9 100644 (file)
--- 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 74869ab710ab5417847b860c743e5339efdc6bab..9deeeb33899b0a7ee07f5a239b17b1ac7c15edb7 100644 (file)
--- 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 c04ff7755f8956823e6362ba737fb06e3911f6be..bca0364a752e5e2195ddcee7e6335137d626527f 100644 (file)
--- 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 -------------------------