X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FCMakeLists.txt;h=b90df141344ae0f4e4963b237f6b174edf9c5966;hb=e2065563ce3b78632aeb30899f93920999028f3e;hp=ef102d989974be4e57900a47f23a7986d0295c61;hpb=163fa80ef3873595f3e3cf75fb03e53536d1a6ee;p=clitk.git

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index ef102d9..b90df14 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,21 +1,16 @@
-#=========================================================
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${ITK_DIR}/gdcm/src/")
-
-#=========================================================
-INCLUDE(${PROJECT_SOURCE_DIR}/cmake/common.cmake)
-#=========================================================
-
 #=========================================================
 # make clitk libraries*
-
-configure_file(clitkConfiguration.h.in ${PROJECT_BINARY_DIR}/clitkConfiguration.h)
+CONFIGURE_FILE(clitkConfiguration.h.in ${PROJECT_BINARY_DIR}/clitkConfiguration.h)
 
 SET(clitkCommon_SRC
   clitkCommon.cxx 
   clitkListOfPair.cxx
   clitkTimer.cxx
   clitkImageCommon.cxx
+  clitkTransformUtilities.cxx
   clitkIO.cxx
+  clitkGateAsciiImageIO.cxx
+  clitkGateAsciiImageIOFactory.cxx
   clitkVoxImageIO.cxx  
   clitkVoxImageIOFactory.cxx
   clitkVfImageIO.cxx  
@@ -25,20 +20,68 @@ SET(clitkCommon_SRC
   clitkXdrImageIOReader.cxx  
   clitkXdrImageIOWriter.cxx  
   clitkXdrImageIOFactory.cxx
+  clitkHndImageIO.cxx
+  clitkHndImageIOFactory.cxx
+  clitkDicomRTDoseIO.cxx
+  clitkDicomRTDoseIOFactory.cxx
   clitkOrientation.cxx
-  vvImage.cxx
   clitkImageToImageGenericFilterBase.cxx
-)  
+  clitkExceptionObject.cxx
+  clitkFilterBase.cxx
+  clitkMemoryUsage.cxx
+  vvImage.cxx
+  vvImageReader.cxx
+  vvImageWriter.cxx
+)
+IF(CLITK_PRIVATE_FEATURES)
+  SET(clitkCommon_SRC ${clitkCommon_SRC}
+    ${PROJECT_SOURCE_DIR}/private_features/clitkUsfImageIO.cxx
+    ${PROJECT_SOURCE_DIR}/private_features/clitkUsfImageIOFactory.cxx
+    ${PROJECT_SOURCE_DIR}/private_features/clitkUSVoxImageIO.cxx
+    ${PROJECT_SOURCE_DIR}/private_features/clitkUSVoxImageIOFactory.cxx
+    ${PROJECT_SOURCE_DIR}/private_features/clitkSvlImageIO.cxx
+    ${PROJECT_SOURCE_DIR}/private_features/clitkSvlImageIOFactory.cxx
+    )
+ENDIF(CLITK_PRIVATE_FEATURES)
 
+### Declare clitkCommon library
 ADD_LIBRARY(clitkCommon STATIC ${clitkCommon_SRC})
 
+IF(NOT ${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+  TARGET_LINK_LIBRARIES(clitkCommon statgrab)
+ENDIF(NOT ${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+
+### Check if ITK was compiled with SYSTEM_GDCM = ON and set the gdcm libraries accordingly
+SET(CLITK_USE_SYSTEM_GDCM FALSE)
+IF(ITK_VERSION_MAJOR LESS "4")
+  IF(ITK_USE_SYSTEM_GDCM)
+    SET(CLITK_USE_SYSTEM_GDCM TRUE) 
+  ENDIF(ITK_USE_SYSTEM_GDCM)
+ELSE(ITK_VERSION_MAJOR LESS "4")
+  SET(GDCM_INCLUDE ".*include/gdcm-.*")
+  #SET(GDCM_INCLUDE ".*/Source/Common")
+  IF(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE})
+    SET(CLITK_USE_SYSTEM_GDCM TRUE)
+  ELSE(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE})
+    MESSAGE("NOT USING SYSTEM_GDCM!!!!!!!")
+  ENDIF(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE})
+ENDIF(ITK_VERSION_MAJOR LESS "4")
+
+IF(CLITK_USE_SYSTEM_GDCM)
+  SET(CLITK_GDCM_LIBRARIES gdcmDSED) 
+ENDIF(CLITK_USE_SYSTEM_GDCM)
+
+TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging ${ITK_LIBRARIES} ${CLITK_GDCM_LIBRARIES})
 
 ADD_LIBRARY(clitkDicomRTStruct STATIC
   clitkDicomRT_Contour.cxx
   clitkDicomRT_ROI.cxx
   clitkDicomRT_StructureSet.cxx
-  clitkDicomRT_ROI_ConvertToImageFilter.cxx
+  clitkDicomRTStruct2ImageFilter.cxx
 )
 
+TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid ${CLITK_GDCM_LIBRARIES}) 
+
 #ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC})
 #SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC)
+