diff --git a/Modules/ThirdParty/GDCM/src/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/CMakeLists.txt
index d7bfca703fb..6b41ce9072a 100644
--- a/Modules/ThirdParty/GDCM/src/CMakeLists.txt
+++ b/Modules/ThirdParty/GDCM/src/CMakeLists.txt
@@ -32,9 +32,8 @@ set(GDCM_BUILD_TESTING_DEFAULT OFF)
 #
 # Expat:
 set(GDCM_USE_SYSTEM_EXPAT ON CACHE INTERNAL "")
-set(EXPAT_INCLUDE_DIR ${ITKExpat_INCLUDE_DIRS})
-set(EXPAT_LIBRARY ${ITKExpat_LIBRARIES})
-set(EXPAT_LIBRARIES ${ITKExpat_LIBRARIES})
+set(EXPAT_INCLUDE_DIRS "")
+set(EXPAT_LIBRARIES "ITK::ITKExpatModule")
 # OpenJPEG:
 set(GDCM_USE_SYSTEM_OPENJPEG ON CACHE INTERNAL "")
 set(GDCM_USE_OPENJPEG_V2 ON CACHE INTERNAL "")
@@ -42,10 +41,8 @@ set(OPENJPEG_INCLUDE_DIRS "")
 set(OPENJPEG_LIBRARIES "ITK::ITKOpenJPEGModule")
 # ZLIB:
 set(GDCM_USE_SYSTEM_ZLIB ON CACHE INTERNAL "")
-set(ZLIB_INCLUDE_DIR ${ITKZLIB_INCLUDE_DIRS})
-set(ZLIB_INCLUDE_DIRS ${ITKZLIB_INCLUDE_DIRS})
-set(ZLIB_LIBRARY ${ITKZLIB_LIBRARIES})
-set(ZLIB_LIBRARIES ${ITKZLIB_LIBRARIES})
+set(ZLIB_INCLUDE_DIRS "")
+set(ZLIB_LIBRARIES "ITK::ITKZLIBModule")
 
 # Configure GDCM privately so its options do not appear to the user.
 set(GDCM_LEGACY_REMOVE OFF CACHE INTERNAL "Remove all legacy code completely.")
@@ -73,12 +70,7 @@ set(GDCM_USE_SYSTEM_LJPEG OFF CACHE INTERNAL "Use system ljpeg (ijg lib)")
 # Use ITK's libjpeg-turbo as the JPEG backend instead of GDCM's IJG 6b
 set(GDCM_USE_JPEGTURBO ON CACHE INTERNAL "Use libjpeg-turbo for JPEG codec")
 if(GDCM_USE_JPEGTURBO)
-  set(
-    GDCM_JPEGTURBO_INCLUDE_DIRS
-    ${ITKJPEG_INCLUDE_DIRS}
-    ${ITKJPEG_SYSTEM_INCLUDE_DIRS}
-  )
-  set(GDCM_JPEGTURBO_LIBRARIES ${ITKJPEG_LIBRARIES})
+  set(GDCM_JPEGTURBO_LIBRARIES ITK::ITKJPEGModule)
 endif()
 set(GDCM_USE_SYSTEM_OPENSSL OFF CACHE INTERNAL "Use system OpenSSL")
 set(GDCM_USE_SYSTEM_PODOFO OFF CACHE INTERNAL "Use system podofo (pdf)")
diff --git a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
index ceff9af65e2..36c38436f31 100644
--- a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
+++ b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
@@ -418,7 +418,9 @@ option(GDCM_USE_SYSTEM_OPENJPEG "Use system openjpeg" OFF)
 option(GDCM_USE_SYSTEM_CHARLS "Use system charls" OFF)
 
 if(GDCM_USE_SYSTEM_OPENJPEG)
-  #find_package(OpenJPEG  REQUIRED)
+  if (NOT OPENJPEG_LIBRARIES)
+    find_package(OpenJPEG REQUIRED)
+  endif()
   set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
 else()
   set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2)