ENH: Configure GDCM to use itkOpenJPEG

bradking · Dec 7, 2024 · ca64d39 · ca64d39
1 parent 6cb4ee3
commit ca64d39
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Modules/ThirdParty/GDCM/itk-module.cmake b/Modules/ThirdParty/GDCM/itk-module.cmake
@@ -13,6 +13,7 @@ else()
     DEPENDS
       ITKZLIB
       ITKExpat
+      ITKOpenJPEG
     DESCRIPTION
       "${DOCUMENTATION}"
   )

diff --git a/Modules/ThirdParty/GDCM/src/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/CMakeLists.txt
@@ -30,8 +30,10 @@ set(GDCM_USE_SYSTEM_EXPAT ON CACHE INTERNAL "")
 set(EXPAT_INCLUDE_DIR ${ITKExpat_INCLUDE_DIRS})
 set(EXPAT_LIBRARY ${ITKExpat_LIBRARIES})
 # OpenJPEG:
-set(GDCM_USE_SYSTEM_OPENJPEG OFF CACHE INTERNAL "")
+set(GDCM_USE_SYSTEM_OPENJPEG ON CACHE INTERNAL "")
 set(GDCM_USE_OPENJPEG_V2 ON CACHE INTERNAL "")
+set(OPENJPEG_INCLUDE_DIRS ${ITKOpenJPEG_INCLUDE_DIRS})
+set(OPENJPEG_LIBRARIES ${ITKOpenJPEG_LIBRARIES})
 # ZLIB:
 set(GDCM_USE_SYSTEM_ZLIB ON CACHE INTERNAL "")
 set(ZLIB_INCLUDE_DIR ${ITKZLIB_INCLUDE_DIRS})

diff --git a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
@@ -353,7 +353,7 @@ else()
 endif()
 
 if(GDCM_USE_SYSTEM_OPENJPEG)
-  find_package(OpenJPEG 2.0.0 REQUIRED)
+  #find_package(OpenJPEG  REQUIRED)
   set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
 else()
   set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2)