From: Eduardo Enrique Davila Serrano Date: Fri, 29 May 2026 12:27:29 +0000 (+0200) Subject: #3459 gdcm1_v1.3.0 to gdcm2_v3.3.0 X-Git-Url: http://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=50139b6c667ab87a3b2b13984834ddd60358c36c;p=creaToolsTools.git #3459 gdcm1_v1.3.0 to gdcm2_v3.3.0 --- diff --git a/Install_mingw64/Install_CreaTools/scripts/All2.bat b/Install_mingw64/Install_CreaTools/scripts/All2.bat index 7139a5e..dbbb396 100644 --- a/Install_mingw64/Install_CreaTools/scripts/All2.bat +++ b/Install_mingw64/Install_CreaTools/scripts/All2.bat @@ -74,6 +74,7 @@ echo call compile creaMinitools start /B /wait %scriptsFolder%\creaMinitoolsInstall.bat + echo THIS HAS TO BE THE LAST STEP... echo call compile creaTools start /B /wait %scriptsFolder%\creaToolsInstall.bat diff --git a/Install_mingw64/Install_CreaTools/scripts/creaImageIOVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaImageIOVariables.bat index 4edce9c..fbb7d17 100644 --- a/Install_mingw64/Install_CreaTools/scripts/creaImageIOVariables.bat +++ b/Install_mingw64/Install_CreaTools/scripts/creaImageIOVariables.bat @@ -49,7 +49,7 @@ 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 BUILD_BBTK_PACKAGE_Transform3Ddicom:BOOL=ON -D creaBruker_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D USE_GDCM:BOOL=ON 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 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 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 169a337..135e764 100644 --- a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt +++ b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt @@ -2,7 +2,7 @@ PROJECT(crea_TPdlls) cmake_minimum_required(VERSION 2.6) -SET(PROJECT_MAJOR_VERSION 5) +SET(PROJECT_MAJOR_VERSION 6) SET(PROJECT_MINOR_VERSION 0) SET(PROJECT_BUILD_VERSION 0) diff --git a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat index 059900a..250e709 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat @@ -62,7 +62,8 @@ set WXVERSION=3.2.1 :: set BOOSTFNAME=boost_1_49_0.7z :: set BOOSTFNAME=boost_1_52_0.7z ::set BOOSTFNAME=boost_1_64_0.7z -set BOOSTFNAME=boost_1_69_0.zip +:: set BOOSTFNAME=boost_1_69_0.zip +set BOOSTFNAME=boost_1_76_0.zip ::set XERCESFNAME=xerces-c-3.1.1.zip ::set XERCESFNAME=xerces-c-3.1.4.zip @@ -78,7 +79,8 @@ set VTKFNAME=VTK-9.2.0.rc1-Patch-2022-08-04.zip ::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_2022_07_21_vtk92.zip +::set GDCMFNAME=gdcm13_2022_07_21_vtk92.zip +set GDCMFNAME=gdcm2-v3.3.0_2026-05-18.zip set TTHFNAME=tth_exe.zip set SQLITEFNAME=sqlite_v3.6.23.1.zip diff --git a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat index 2ce43b5..37628a4 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat @@ -35,10 +35,11 @@ if %PROCESSOR_ARCHITECTURE%==x86 ( set qt=qt set jom=jom set wxWidgets=wxWidgets -set boost=boost +set boost=boost_1_76_0 set xercesc=xerces set itk=itk -set gdcm=gdcm13 +::set gdcm=gdcm13 +set gdcm=gdcm2-v3.3.0_2026-05-18 set vtk=vtk set sqlite=sqlite set dlfcn=dlfcn-win32 @@ -283,10 +284,12 @@ cd %gdcm%Bin ::cd c:\ %cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin >> %LogFolder%\GDCMInstall.log 2>&1 %cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1 -%cmakeBin% -D VTK_DIR:PATH=%binpath%\%vtk%Bin\ -D GDCM_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1 -%cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1 -mingw32-make.exe -j%NUMBER_OF_PROCESSORS% >> %LogFolder%\GDCMInstall.log 2>&1 -mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install >> %LogFolder%\GDCMInstall.log 2>&1 +:: %cmakeBin% -D VTK_DIR:PATH=%binpath%\%vtk%Bin\ -D GDCM_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1 +::EED 2026-05-18 +%cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON CMakeCache.txt -D GDCM_USE_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1 +%cmakeBin% -D VTK_DIR:PATH=%binpath%\%vtk%Bin\ >> %LogFolder%\GDCMInstall.log 2>&1 +mingw32-make.exe -j%NUMBER_OF_PROCESSORS% >> %LogFolder%\GDCMInstall.log 2>&1 +mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install >> %LogFolder%\GDCMInstall.log 2>&1 :SKIPINSTALLGDCM @@ -311,6 +314,11 @@ cd %itk%Bin %cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1 %cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1 ::%cmakeBin% -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview::BOOL=ON CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1 + +::EED 026-05-18 +%cmakeBin% -D ITK_USE_SYSTEM_GDCM::BOOL=ON CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1 +%cmakeBin% -D GDCM_DIR::PATH=%installpath%\lib\gdcm-3.3 CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1 + %cmakeBin% -D Module_ITKReview::BOOL=ON CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1 mingw32-make.exe -j%NUMBER_OF_PROCESSORS% >> %LogFolder%\ITKInstall.log 2>&1 mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install >> %LogFolder%\ITKInstall.log 2>&1