X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=8e2191899241dfe10da6fdeb579872edcc511a00;hb=27c13d8efe261754a50c3e531123ae916c166b36;hp=b68fae5efeed9ed320e2432be423ad723630950f;hpb=4a06c62b6959928e6b9d18ec3f72b8a3f50ac62a;p=creaImageIO.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b68fae5..8e21918 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(LIBRARY_NAME creaImageIO2)
+SET(LIBRARY_NAME creaImageIO)
 
 
 FILE(GLOB SOURCES_CREAIMAGEIO  
@@ -46,7 +46,8 @@ ENDIF(USE_GDCM)
 	  
 IF(USE_GDCM2)
  FILE(GLOB SOURCES_CREAIMAGEIO_IMG_DICOM_READER
-		creaImageIODicomImageReader2.cpp)
+		creaImageIODicomImageReader2.cpp
+		creaImageIODicomScanner.cpp)
 ENDIF(USE_GDCM2)
 
  # Image Readers
@@ -171,7 +172,7 @@ INSTALL(
 #    ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
 #    )
 SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
-    src2
+    src
     win32
 )
 
@@ -197,17 +198,17 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
   
   SET(${LIBRARY_NAME}_HAS_ADDITIONAL_CONFIG_FILE TRUE)
 SET(${LIBRARY_NAME}_ADDITIONAL_CONFIG_FILE 
-  ${PROJECT_SOURCE_DIR}/src2/Additional${LIBRARY_NAME}Config.cmake.in)
+  ${PROJECT_SOURCE_DIR}/src/Additional${LIBRARY_NAME}Config.cmake.in)
 SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE 
-  ${PROJECT_SOURCE_DIR}/src2/AdditionalUse${LIBRARY_NAME}.cmake.in)
+  ${PROJECT_SOURCE_DIR}/src/AdditionalUse${LIBRARY_NAME}.cmake.in)
 
   # Invoke the advanced macro
   CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 IF (WIN32)
-	SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src2/data)
+	SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
 	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/Shared/gimmick)
 ELSE (WIN32)
-	SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src2/data)
+	SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
 	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/gimmick)
 ENDIF (WIN32)
 CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
@@ -223,6 +224,6 @@ ENDIF(BUILD_DOXYGEN_DOC)
 
 INCLUDE_DIRECTORIES(
 #  ${PROJECT_BINARY_DIR}
-  ${PROJECT_SOURCE_DIR}/src2
-#  ${PROJECT_SOURCE_DIR}/src2/CppSQLite3
+  ${PROJECT_SOURCE_DIR}/src
+#  ${PROJECT_SOURCE_DIR}/src/CppSQLite3
   )