X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FCMakeLists.txt;h=0ff0321c826892220dfd872297978efe7719b260;hb=ef33edbce5ce9f897e3e6acbc5d36718407329c0;hp=a51a929588bf4c45d626c317e176c366742fd21d;hpb=931a42358442f4ee4f314613c991c838d4b4e3b7;p=clitk.git

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index a51a929..0ff0321 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,50 +1,90 @@
 #=========================================================
-# Compiled Image types
-# Comment/uncomment desired image types
-
-#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DIMAGETYPE_CHAR")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DIMAGETYPE_UCHAR")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DIMAGETYPE_SHORT")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DIMAGETYPE_USHORT")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DIMAGETYPE_INT")
-#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DIMAGETYPE_UINT")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DIMAGETYPE_FLOAT")
-#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DIMAGETYPE_DOUBLE")
-
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${ITK_DIR}/gdcm/src/")
-
-#=========================================================
-# Compiled Image Dimension 
-# Comment/uncomment desired image dimensions
-
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DIMAGEDIM_1")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DIMAGEDIM_2")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DIMAGEDIM_3")
-#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DIMAGEDIM_4")
-
-#=========================================================
-INCLUDE(${PROJECT_SOURCE_DIR}/cmake/common.cmake)
-#=========================================================
-
-#=========================================================
-# make clitk libraries
+# make clitk libraries*
+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  
   clitkVfImageIOFactory.cxx
+  clitkXdrImageIOReader.cxx  
+  clitkXdrImageIOWriter.cxx  
+  clitkXdrImageIOFactory.cxx
+  rtkHisImageIO.cxx  
+  rtkHisImageIOFactory.cxx
+  rtkHndImageIO.cxx
+  rtkHndImageIOFactory.cxx
+  rtkEdfImageIO.cxx
+  rtkEdfImageIOFactory.cxx
+  rtkXRadImageIO.cxx
+  rtkXRadImageIOFactory.cxx
+  rtkImagXImageIO.cxx
+  rtkImagXImageIOFactory.cxx
+  rtkImagXXMLFileReader.cxx
+  clitkEsrfHstImageIO.cxx  
+  clitkEsrfHstImageIOFactory.cxx
+  clitkEsrfHstXMLFileReader.cxx
+  clitkDicomRTDoseIO.cxx
+  clitkDicomRTDoseIOFactory.cxx
   clitkOrientation.cxx
-  clitkSignal.cxx
+  clitkImageToImageGenericFilterBase.cxx
+  clitkExceptionObject.cxx
+  clitkFilterBase.cxx
+  clitkMemoryUsage.cxx
   vvImage.cxx
-  clitkImageToImageGenericFilter.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(CLITK_MEMORY_INFO)
+  TARGET_LINK_LIBRARIES(clitkCommon statgrab)
+ENDIF(CLITK_MEMORY_INFO)
+
+
+### Set add libraries if system GDCM 
+DD(CLITK_USE_SYSTEM_GDCM)
+IF (CLITK_USE_SYSTEM_GDCM)
+  FIND_PACKAGE(GDCM REQUIRED)
+  DD(GDCM_USE_FILE)
+  DD(GDCM_INCLUDE_DIRS)
+  DD(GDCM_LIBRARY_DIRS)
+  #SET(CLITK_GDCM_LIBRARIES gdcmDSED) 
+  SET(CLITK_GDCM_LIBRARIES gdcmDICT gdcmMSFF vtkgdcm)
+  DD(CLITK_GDCM_LIBRARIES)
+ENDIF()
+
+TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging ${ITK_LIBRARIES} ${CLITK_GDCM_LIBRARIES})
+
+ADD_LIBRARY(clitkDicomRTStruct STATIC
+  clitkDicomRT_Contour.cxx
+  clitkDicomRT_ROI.cxx
+  clitkDicomRT_StructureSet.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)
+