X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FCMakeLists.txt;h=b68fae5efeed9ed320e2432be423ad723630950f;hb=11c1e921c0a4befcdb7fac9fe8e92fca297488f7;hp=8908fc5ac833315be6850cfed3b81b7ac9da86e9;hpb=e79fb1c492e93cdd1a5a95ba0ab491b868cf5992;p=creaImageIO.git

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 8908fc5..b68fae5 100644
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -24,6 +24,8 @@ FILE(GLOB SOURCES_CREAIMAGEIO
   creaImageIOListener.cpp
 )
  
+ 
+ 
  # Attributed tree data structure
 FILE(GLOB SOURCES_CREAIMAGEIO_TREE
 	  creaImageIOTree.cpp
@@ -36,15 +38,25 @@ FILE(GLOB SOURCES_CREAIMAGEIO_TREE
 	  creaImageIOTreeHandlerImageAdder.cpp
 	  creaImageIOSQLiteTreeHandler.cpp
 	  )
- 
+IF(USE_GDCM)
+ FILE(GLOB SOURCES_CREAIMAGEIO_IMG_DICOM_READER
+		creaImageIODicomImageReader.cpp)
+ENDIF(USE_GDCM)
+
+	  
+IF(USE_GDCM2)
+ FILE(GLOB SOURCES_CREAIMAGEIO_IMG_DICOM_READER
+		creaImageIODicomImageReader2.cpp)
+ENDIF(USE_GDCM2)
+
  # Image Readers
 FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
 	  creaImageIOAbstractImageReader.cpp
-	  creaImageIODicomImageReader.cpp
 	  creaImageIOImageReader.cpp
 	  creaImageIOUltrasonixImageReader.cpp
 	  creaImageIOVtkImageReader.cpp
 	  creaImageIOMultiThreadImageReader.cpp
+	  ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
  	  )
 
 
@@ -81,7 +93,8 @@ if(BUILD_CREA_PACS)
 	SOURCE_GROUP("Source Files\\PACS" FILES ${SOURCES_CREAIMAGEIO_PACS})
 	SOURCE_GROUP("Header Files\\PACS" FILES ${HEADER_CREAIMAGEIO_PACS})
 endif(BUILD_CREA_PACS)
-SOURCE_GROUP("Source Files\\Readers" FILES ${SOURCES_CREAIMAGEIO_IMG_READER})
+SOURCE_GROUP("Source Files\\Readers" FILES ${SOURCES_CREAIMAGEIO_IMG_READER}
+											${SOURCES_CREAIMAGEIO_IMG_DICOM_READER})
 SOURCE_GROUP("Source Files\\Tree" FILES ${SOURCES_CREAIMAGEIO_TREE})
 
 
@@ -89,6 +102,7 @@ SET( PRIMITIVE_SRCS
  ${SOURCES_CREAIMAGEIO}
  ${HEADER_CREAIMAGEIO}
  ${SOURCES_CREAIMAGEIO_IMG_READER}
+ ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
  ${SOURCES_CREAIMAGEIO_WX}
  ${SOURCES_CREAIMAGEIO_TREE}
 )
@@ -194,7 +208,7 @@ IF (WIN32)
 	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/Shared/gimmick)
 ELSE (WIN32)
 	SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src2/data)
-	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/Shared/gimmick)
+	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/gimmick)
 ENDIF (WIN32)
 CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})