X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FCMakeLists.txt;h=91f53e5f5dcabe35d3f3011ab3175dfa1a429429;hb=7c429b3233bac2aa0fc58bf99672a63ad9d8241d;hp=ebe4dff285808e01b16ec47eef0df5c969723bd3;hpb=8eaf0a647fec2440abf6064d78d3eab735aa90c6;p=clitk.git

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index ebe4dff..91f53e5 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,7 +1,3 @@
-#=========================================================
-INCLUDE(${PROJECT_SOURCE_DIR}/cmake/common.cmake)
-#=========================================================
-
 #=========================================================
 # make clitk libraries*
 CONFIGURE_FILE(clitkConfiguration.h.in ${PROJECT_BINARY_DIR}/clitkConfiguration.h)
@@ -13,6 +9,8 @@ SET(clitkCommon_SRC
   clitkImageCommon.cxx
   clitkTransformUtilities.cxx
   clitkIO.cxx
+  clitkGateAsciiImageIO.cxx
+  clitkGateAsciiImageIOFactory.cxx
   clitkVoxImageIO.cxx  
   clitkVoxImageIOFactory.cxx
   clitkVfImageIO.cxx  
@@ -35,6 +33,14 @@ SET(clitkCommon_SRC
   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
+    )
+ENDIF(CLITK_PRIVATE_FEATURES)
 
 ### Declare clitkCommon library
 ADD_LIBRARY(clitkCommon STATIC ${clitkCommon_SRC})
@@ -49,7 +55,7 @@ ADD_LIBRARY(clitkDicomRTStruct STATIC
   clitkDicomRT_Contour.cxx
   clitkDicomRT_ROI.cxx
   clitkDicomRT_StructureSet.cxx
-  clitkDicomRT_ROI_ConvertToImageFilter.cxx
+  clitkDicomRTStruct2ImageFilter.cxx
 )
 
 TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid) 
@@ -57,8 +63,3 @@ TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid)
 #ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC})
 #SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC)
 
-#passing environnment variable
-configure_file (
- globals.h.in
- globals.h
-)