From e2b9d8b241e543bf472b8bb25ccd6f0c702f06f9 Mon Sep 17 00:00:00 2001
From: "eduardo.davila@creatis.insa-lyon.fr"
 <eduardo.davila@creatis.insa-lyon.fr>
Date: Tue, 19 May 2026 15:25:17 +0200
Subject: [PATCH] #3399 gdcm1 -> gdcm2 v3.3.0

---
 cmake/CREAMacro_FindAndUseLibraries.cmake | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 0b3d133..21a7ef3 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -89,17 +89,13 @@ if(APPLE )
 endif()
 
 
-message("------------ EED OPENMP Flag 1")
 # EED 2024-16-01
   find_package( OpenMP REQUIRED )
 #  find_package( OpenMP )
 #  find_package(OpenMP COMPONENTS CXX)
   
-message("------------ EED OPENMP Flag 2")
 if (OPENMP_FOUND)
 
-    message("------------ EED OPENMP yesssssssssss")
-
 #    include_directories("${OPENMP_INCLUDES}")
 
     link_directories( /opt/local/lib/libomp  ) 
@@ -107,17 +103,14 @@ if (OPENMP_FOUND)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
     # set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
 ELSE(OPENMP_FOUND)
-    message("------------ EED OPENMP noooooooooo")
+    message("------------ EED Not found OPENMP ")
 	
 endif(OPENMP_FOUND)
 
-
 ENDIF(USE_OPENMP)
 
 #-----------------------------------------------------------------------------
 
-
-
 #-----------------------------------------------------------------------------
 IF(USE_KWWIDGETS)
   IF(NOT KWWidgets_FOUND)
@@ -186,7 +179,7 @@ ENDIF(USE_ITK)
 
 #-----------------------------------------------------------------------------
 
-IF(USE_GDCM_UPS_EED)
+IF(USE_GDCM)
   IF (USE_GDCM2)
     MESSAGE(ERROR "CANNOT USE BOTH gdcm AND gdcm2 !")
   ENDIF (USE_GDCM2)
@@ -234,7 +227,7 @@ IF(USE_GDCM_UPS_EED)
     ENDIF(GDCM_FOUND)
 
   ENDIF(NOT GDCM_FOUND)
-ENDIF(USE_GDCM_UPS_EED)
+ENDIF(USE_GDCM)
 
 #-----------------------------------------------------------------------------
 
@@ -248,7 +241,8 @@ ENDIF(USE_GDCM2)
 #-----------------------------------------------------------------------------
 
 
-IF(USE_GDCM2_UPS_EED)
+IF(USE_GDCM2)
+
   IF (USE_GDCM)
     MESSAGE(ERROR "CANNOT USE BOTH gdcm AND gdcm2 !")
   ENDIF (USE_GDCM)
@@ -259,14 +253,14 @@ IF(USE_GDCM2_UPS_EED)
     FIND_PACKAGE(GDCM REQUIRED)
     INCLUDE(${GDCM_USE_FILE})
 
-      IF(NOT ${GDCM_MAJOR_VERSION} EQUAL 3)
+    IF(NOT ${GDCM_MAJOR_VERSION} EQUAL 3)
 	MESSAGE(FATAL_ERROR "gdcm version 2 needed. found ${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}. Set GDCM_DIR to the gdcm version 2 directory")
-      ENDIF(NOT ${GDCM_MAJOR_VERSION} EQUAL 2)
+      ENDIF(NOT ${GDCM_MAJOR_VERSION} EQUAL 3)
       
       CREA_DEFINE( USE_GDCM2 )
 	  MARK_AS_ADVANCED(GDCM_DIR)
-      CREA_DEFINE_WITH_VAL( GDCM_NAME_SPACE gdcm )
-      
+#EED      CREA_DEFINE_WITH_VAL( GDCM_NAME_SPACE gdcm )
+ 
       MESSAGE ( STATUS "=======================================")
       MESSAGE ( STATUS "Looking for GDCM2... found")
       MESSAGE ( STATUS "* Dir       = ${GDCM_DIR}")
@@ -275,13 +269,17 @@ IF(USE_GDCM2_UPS_EED)
       
       # Test that GDCM_NAME_SPACE is **NOT** "gdcm" or will conflict with 
       # embedded gdcm in ITK and will result in hard seg faults !
-		   INCLUDE_DIRECTORIES(${GDCM_INCLUDE_DIRS})	 
-	  		LINK_DIRECTORIES( ${GDCM_LIBRARY_DIRS}) 
-			
+		INCLUDE_DIRECTORIES(${GDCM_INCLUDE_DIRS} )	 		   
+		
+        ##EED1   with .../vtk-9.2
+		INCLUDE_DIRECTORIES(${GDCM_INCLUDE_DIRS} ${GDCM_INCLUDE_DIRS}/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} )	 
+		
+	  	LINK_DIRECTORIES( ${GDCM_LIBRARY_DIRS}  ) 
+
       SET(GDCM2_LIBRARIES
         ${GDCM_LIBRARIES}
 	)
-
+	
       IF(USE_GDCM_VTK)
 	IF(USE_VTK)
 		IF(WIN32)
@@ -306,8 +304,10 @@ IF(USE_GDCM2_UPS_EED)
 		ELSE(WIN32)
 		    SET(GDCM_LIBRARIES
 	  	        ${GDCM_LIBRARIES}
-			vtkgdcm
+			vtkgdcm-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}
 			gdcmIOD
+			gdcmDICT 
+			gdcmMSFF
 			)
 		ENDIF(WIN32)
 		
@@ -315,7 +315,7 @@ IF(USE_GDCM2_UPS_EED)
       ENDIF(USE_GDCM_VTK)
  # ENDIF(NOT USE_ITK) # JPR : ITK vs GDCM (avoid cmake break)
 
-ENDIF(USE_GDCM2_UPS_EED)
+ENDIF(USE_GDCM2)
 
 #-----------------------------------------------------------------------------
 
-- 
2.54.0