X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage.cmake;h=27fea041200fcfe4e6bd148130024f4c70eccf67;hb=de36a36c2266946ffed8754462981d084b8a1268;hp=83cc430bf52178a1eebaee1ccef7a9838aabfcf3;hpb=f7f26377e49c7ae9e52ae102329b016fd6482da0;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index 83cc430..27fea04 100644
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -142,6 +142,17 @@ IF(${BBTK_PACKAGE_NAME}_USE_ITK)
     ${${BBTK_PACKAGE_NAME}_LIBS}
     ${ITK_LIBRARIES}
     )
+
+	#Need to add additional gdcm  libraries provided by system
+	IF(WIN32)
+		IF(USE_GDCM2)
+			SET(${BBTK_PACKAGE_NAME}_LIBS
+				${${BBTK_PACKAGE_NAME}_LIBS}
+				 vtkgdcm gdcmIOD gdcmMSFF gdcmexpat gdcmCommon gdcmMEXD gdcmDSED gdcmDICT 
+					gdcmjpeg8 gdcmjpeg12 gdcmjpeg16 socketxx gdcmopenjpeg gdcmcharls 
+				)
+		ENDIF()
+	ENDIF(WIN32)
 ENDIF(${BBTK_PACKAGE_NAME}_USE_ITK)
 
 IF(${BBTK_PACKAGE_NAME}_USE_QT)
@@ -162,6 +173,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_GDCM)
     ${${BBTK_PACKAGE_NAME}_LIBS}
     ${GDCM_LIBRARIES}
     )
+
 	IF(USE_GDCM)
 		IF(USE_GDCM2)
 		message(FATAL_ERROR "You cannot select both GDCM and GDCM2 (DICOM library readers)")
@@ -174,10 +186,20 @@ ENDIF(${BBTK_PACKAGE_NAME}_USE_GDCM)
 IF(${BBTK_PACKAGE_NAME}_USE_GDCM2)
   SET(USE_GDCM2 ON CACHE BOOL "Use GDCM2" FORCE)
   SET(USE_GDCM2_VTK ON CACHE BOOL "Use GDCM2_VTK" FORCE)
-  SET(${BBTK_PACKAGE_NAME}_LIBS
-    ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${GDCM2_LIBRARIES}
-    )
+  #For some reasons GDCM_LIBRARY is not defined for gdcm2 in windows
+  IF(WIN32)
+	SET(${BBTK_PACKAGE_NAME}_LIBS
+		${${BBTK_PACKAGE_NAME}_LIBS}
+		vtkgdcm gdcmIOD gdcmMSFF gdcmexpat gdcmCommon gdcmMEXD gdcmDSED gdcmDICT 
+		gdcmjpeg8 gdcmjpeg12 gdcmjpeg16 socketxx gdcmopenjpeg gdcmcharls 
+		)
+  ELSE(WIN32)
+	SET(${BBTK_PACKAGE_NAME}_LIBS
+		${${BBTK_PACKAGE_NAME}_LIBS}
+		${GDCM_LIBRARY}
+		)
+	ENDIF(WIN32)
+		
 	IF(USE_GDCM2)
 		IF(USE_GDCM)
 		message(FATAL_ERROR "You cannot select both GDCM and GDCM2 (DICOM library readers)")