X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FCMakeLists.txt;h=e17c4dc3e05363b95faab046f6b7997835b65c0f;hb=d55f025b18f68066a52b8f33c2dc6481e82c2580;hp=cd6af5b41b3066f07fd7109e8a536efe1a431930;hpb=095918eb5242d8f92e2e53b6a226ddf519512bd8;p=clitk.git

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index cd6af5b..e17c4dc 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,9 +1,9 @@
 #=========================================================
 # 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 
+set(clitkCommon_SRC
+  clitkCommon.cxx
   clitkListOfPair.cxx
   clitkTimer.cxx
   clitkImageCommon.cxx
@@ -11,14 +11,14 @@ SET(clitkCommon_SRC
   clitkIO.cxx
   clitkGateAsciiImageIO.cxx
   clitkGateAsciiImageIOFactory.cxx
-  clitkVoxImageIO.cxx  
+  clitkVoxImageIO.cxx
   clitkVoxImageIOFactory.cxx
-  clitkVfImageIO.cxx  
+  clitkVfImageIO.cxx
   clitkVfImageIOFactory.cxx
-  clitkXdrImageIOReader.cxx  
-  clitkXdrImageIOWriter.cxx  
+  clitkXdrImageIOReader.cxx
+  clitkXdrImageIOWriter.cxx
   clitkXdrImageIOFactory.cxx
-  rtkHisImageIO.cxx  
+  rtkHisImageIO.cxx
   rtkHisImageIOFactory.cxx
   rtkHndImageIO.cxx
   rtkHndImageIOFactory.cxx
@@ -29,7 +29,7 @@ SET(clitkCommon_SRC
   rtkImagXImageIO.cxx
   rtkImagXImageIOFactory.cxx
   rtkImagXXMLFileReader.cxx
-  clitkEsrfHstImageIO.cxx  
+  clitkEsrfHstImageIO.cxx
   clitkEsrfHstImageIOFactory.cxx
   clitkEsrfHstXMLFileReader.cxx
   clitkDicomRTDoseIO.cxx
@@ -39,12 +39,13 @@ SET(clitkCommon_SRC
   clitkExceptionObject.cxx
   clitkFilterBase.cxx
   clitkMemoryUsage.cxx
+  clitkMatrix.cxx
   vvImage.cxx
   vvImageReader.cxx
   vvImageWriter.cxx
 )
-IF(CLITK_PRIVATE_FEATURES)
-  SET(clitkCommon_SRC ${clitkCommon_SRC}
+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
@@ -52,44 +53,35 @@ IF(CLITK_PRIVATE_FEATURES)
     ${PROJECT_SOURCE_DIR}/private_features/clitkSvlImageIO.cxx
     ${PROJECT_SOURCE_DIR}/private_features/clitkSvlImageIOFactory.cxx
     )
-ENDIF(CLITK_PRIVATE_FEATURES)
+endif(CLITK_PRIVATE_FEATURES)
 
 ### Declare clitkCommon library
-ADD_LIBRARY(clitkCommon STATIC ${clitkCommon_SRC})
+add_library(clitkCommon STATIC ${clitkCommon_SRC})
 
-IF(CLITK_MEMORY_INFO)
-  TARGET_LINK_LIBRARIES(clitkCommon statgrab)
-ENDIF(CLITK_MEMORY_INFO)
+if(CLITK_MEMORY_INFO)
+  target_link_libraries(clitkCommon statgrab)
+endif(CLITK_MEMORY_INFO)
 
-### 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_INSTALL ".*include/gdcm-.*")
-  SET(GDCM_INCLUDE_BUILD ".*/Source/MediaStorageAndFileFormat")
-  IF(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE_BUILD} OR ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE_INSTALL})
-    SET(CLITK_USE_SYSTEM_GDCM TRUE)
-  ENDIF(ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE_BUILD} OR ITKGDCM_INCLUDE_DIRS MATCHES ${GDCM_INCLUDE_INSTALL})
-ENDIF(ITK_VERSION_MAJOR LESS "4")
 
-IF(CLITK_USE_SYSTEM_GDCM)
-  SET(CLITK_GDCM_LIBRARIES gdcmDSED) 
-ENDIF(CLITK_USE_SYSTEM_GDCM)
+#=========================================================
+if(CLITK_USE_SYSTEM_GDCM)
+  find_package(GDCM REQUIRED)
+  include(${GDCM_USE_FILE})
+  target_link_libraries(clitkCommon vtkgdcm gdcmDICT gdcmMSFF gdcmMEXD)
+endif()
+#=========================================================
 
-TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging ${ITK_LIBRARIES} ${CLITK_GDCM_LIBRARIES})
+target_link_libraries(clitkCommon ${VTK_LIBRARIES} ${ITK_LIBRARIES})
 
-ADD_LIBRARY(clitkDicomRTStruct STATIC
+add_library(clitkDicomRTStruct STATIC
   clitkDicomRT_Contour.cxx
   clitkDicomRT_ROI.cxx
   clitkDicomRT_StructureSet.cxx
   clitkDicomRTStruct2ImageFilter.cxx
-)
+  )
 
-TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid ${CLITK_GDCM_LIBRARIES}) 
+target_link_libraries(clitkDicomRTStruct clitkCommon)
 
-#ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC})
-#SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC)
+#add_library(clitkCommonShared SHARED ${clitkCommon_SRC})
+#set_target_properties(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC)