Merge branch 'vtk9itk5wx3-macos' of ssh://git.creatis.insa-lyon.fr/creaToolsTools...

diff --git a/Install_mingw64/Install_CreaTools/scripts/All2.bat b/Install_mingw64/Install_CreaTools/scripts/All2.bat
index 2d10a27a59eba8149574ed44e6751c988ca7360c..7139a5e66b812ad6e388061dc52b3ddad7452220 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/All2.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/All2.bat
@@ -45,6 +45,8 @@ mkdir c_%buildtype%%platforme%\log
 echo call configure variables
 call %scriptsFolder%\base\configureVariables.bat
 
+set PATH=%DirMingwDlls%;%PATH%
+
 REM goto skypToEED
 REM :skypToEED
 

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/compilemod.bat b/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat
index a231bfabc6ec5ea59ce04159360aa5635a59c040..f026a6419b5df6080761361db1435ebdde947b70 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat
@@ -66,8 +66,8 @@ REM msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Config
 ::msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 INSTALL.vcxproj
 ::msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 PACKAGE.vcxproj
 
-mingw32-make.exe -j%NUMBER_OF_PROCESSORS% 
-mingw32-make.exe install
+%DirMingwDlls%\mingw32-make.exe -j%NUMBER_OF_PROCESSORS% 
+%DirMingwDlls%\mingw32-make.exe install
 
 ::copy %2*.exe %3\c_%buildtype%%platforme%\ri\
 

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_CreaTools/scripts/creaImageIOVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaImageIOVariables.bat
index 61dab8c7310dc9e7bc37bfe5c1873ac212f81611..4edce9cc4459dfbe62c411321cf6a85ba7de3661 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/creaImageIOVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/creaImageIOVariables.bat
@@ -49,8 +49,8 @@ IF %4==Debug (
 ::%cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive" CMakeCache.txt
 
 %cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
-%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaBruker_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D USE_GDCM:BOOL=ON CMakeCache.txt
-%cmakeBin% -D BUILD_DOXYGEN_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
+%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D BUILD_BBTK_PACKAGE_Transform3Ddicom:BOOL=ON -D creaBruker_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D USE_GDCM:BOOL=ON CMakeCache.txt
+%cmakeBin% -D BUILD_DOXYGEN_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_Transform3Ddicom_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 %cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive" CMakeCache.txt
 
 exit /B
\ No newline at end of file

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..059900a74956c146bf6eddd78d52a0cd5209afa9 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
@@ -56,8 +56,8 @@ set ITKFNAME=InsightToolkit-5.0.1-patchCreatis.zip
 
 ::set WXFNAME=wxWidgets-2.8.12.zip
 ::set WXVERSION=2.8.12
-set WXFNAME=wxWidgets-3.0.4.7z
-set WXVERSION=3.0.4
+set WXFNAME=wxWidgets-3.2.1.zip
+set WXVERSION=3.2.1
 
 :: set BOOSTFNAME=boost_1_49_0.7z
 :: set BOOSTFNAME=boost_1_52_0.7z
@@ -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..2ce43b596094bcbb6da4493c754033cd204fe708 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -145,10 +145,10 @@ cd %wxWidgets%Bin
 :: 3.0.4 manual
 :: https://wiki.wxwidgets.org/Compiling_wxWidgets_with_MinGW
 cd %sourcepath%\%wxWidgets%\build\msw                                 
-mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release clean                                    >> %LogFolder%\wxWidgetsInstall.log 2>&1
-mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release -j%NUMBER_OF_PROCESSORS%      >> %LogFolder%\wxWidgetsInstall.log 2>&1
-mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release -j%NUMBER_OF_PROCESSORS%      >> %LogFolder%\wxWidgetsInstall.log 2>&1
-mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release                                                  >> %LogFolder%\wxWidgetsInstall.log 2>&1
+%DirMingwDlls%\mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release clean                                     >> %LogFolder%\wxWidgetsInstall.log 2>&1
+%DirMingwDlls%\mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release -j%NUMBER_OF_PROCESSORS%      >> %LogFolder%\wxWidgetsInstall.log 2>&1
+%DirMingwDlls%\mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release -j%NUMBER_OF_PROCESSORS%      >> %LogFolder%\wxWidgetsInstall.log 2>&1
+%DirMingwDlls%\mingw32-make -f makefile.gcc SHARED=1 UNICODE=1 BUILD=release                                                   >> %LogFolder%\wxWidgetsInstall.log 2>&1
 cd ..\..                                                                           
 mkdir %installpath%                                                                                    >> %LogFolder%\wxWidgetsInstall.log 2>&1
 mkdir %installpath%\lib                                                                                >> %LogFolder%\wxWidgetsInstall.log 2>&1
@@ -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/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..dc013ef7445e7186e551de4a7fe03b57c4aa4364 100644 (file)
--- a/Install_mingw64/config_win.bat
+++ b/Install_mingw64/config_win.bat
@@ -1,14 +1,16 @@
 
 
 ::--------- 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\ups\mingw64-8.5-posix\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 -------------------------

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index 2cf3c85d65dcb3185aef71a6db75678035c677fc..0837e98c0debb87d81d8cee0fc8032bcdc9600cd 100644 (file)
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -158,13 +158,14 @@ $(eval $cmd)
         
         cp /opt/local/lib/libjpeg.8.dylib          .
         cp /opt/local/lib/libpng16.16.dylib        .
-        cp /opt/local/lib/libtiff.5.dylib             .
+        cp /opt/local/lib/libtiff.6.dylib             .
+        cp /opt/local/lib/libLerc.4.dylib                     .
         cp /opt/local/lib/libz.1.dylib                        .
         cp /opt/local/lib/libzstd.1.dylib             .
                
-        cp /opt/local/lib/libicudata.67.dylib      .
-        cp /opt/local/lib/libicui18n.67.dylib     .
-        cp /opt/local/lib/libicuuc.67.dylib       .
+        cp /opt/local/lib/libicudata.72.dylib      .
+        cp /opt/local/lib/libicui18n.72.dylib     .
+        cp /opt/local/lib/libicuuc.72.dylib       .
 
                mkdir opt
         cp /opt/local/lib/libiconv.2.dylib            opt/.
@@ -276,7 +277,7 @@ $(eval $cmd)
      echo "echo  Install dir:" >>  $filename_BinVersion
      echo "pwd"    >>  $filename_BinVersion
      echo "echo  " >>  $filename_BinVersion
-     echo "read -p 'Press [Enter] key to continue...'" >>  $filename_BinVersion
+#EED     echo "read -p 'Press [Enter] key to continue...'" >>  $filename_BinVersion
      scp $filename_BinVersion $distanceAdress/. 
      rm creatools_install
      rm thirdparty_install

diff --git a/Linux/scripts/creaImageIOVariables.sh b/Linux/scripts/creaImageIOVariables.sh
index 81b7e85f50a7cf9c8905d979e22e001b6ab509bf..4bb4d5604542cba237ff85fa5eeb3f7422617151 100644 (file)
--- a/Linux/scripts/creaImageIOVariables.sh
+++ b/Linux/scripts/creaImageIOVariables.sh
@@ -51,14 +51,13 @@ if [ "$TDx" == "ON" ]; then
   cxxFlags=$cxxFlags'-F/Library/Frameworks '
 fi
 
-cmake -D CMAKE_CXX_FLAGS:STRING="$cxxFlags"                                    CMakeCache.txt
-cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin               CMakeCache.txt
-cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin               CMakeCache.txt
-cmake -D creaBruker_DIR:PATH=$currentdir/creatools_bin/creaBrukerBin   CMakeCache.txt
-cmake -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON                        CMakeCache.txt
+cmake -D CMAKE_CXX_FLAGS:STRING="$cxxFlags"                                                              CMakeCache.txt
+cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin                                         CMakeCache.txt
+cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin                                         CMakeCache.txt
+cmake -D creaBruker_DIR:PATH=$currentdir/creatools_bin/creaBrukerBin                             CMakeCache.txt
+cmake -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D BUILD_BBTK_PACKAGE_Transform3Ddicom:BOOL=ON    CMakeCache.txt
 cmake -D BUILD_creaImageIO_DOC:BOOL=$3  -D USE_GDCM2:BOOL=$boolgdcm2 -D USE_GDCM:BOOL=$boolgdcm1  CMakeCache.txt
-cmake -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=$3           CMakeCache.txt
-
+cmake -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=$3 -D BUILD_BBTK_PACKAGE_Transform3Ddicom_DOXYGEN_DOC:BOOL=$3           CMakeCache.txt
 cmake CMakeCache.txt
 
 cd ..