correction of minor bugs: quotes and last slice in first place

[creaImageIO.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7b27ba0454c9178f077956bbff56a722642169f..bce3f2be3170872481828e3711bff374bb2c243d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,6 +56,11 @@ IF(USE_GDCM2)
                        )
 ENDIF(USE_GDCM2)
 
+IF (USE_WXWIDGETS)
+       FILE(GLOB SOURCES_CREAIMAGEIO_MULTI_IMG_READER   creaImageIOMultiThreadImageReader.cpp)
+ELSEIF(USE_QT4)
+       FILE(GLOB SOURCES_CREAIMAGEIO_MULTI_IMG_READER   creaImageIOQMultiThreadImageReader.cpp)
+ENDIF()
 
 FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
          creaImageIOSimpleView.cpp
@@ -63,9 +68,16 @@ FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
          creaImageIOImageReader.cpp
          creaImageIOUltrasonixImageReader.cpp
          creaImageIOVtkImageReader.cpp
-         creaImageIOQMultiThreadImageReader.cpp
          ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
+         ${SOURCES_CREAIMAGEIO_MULTI_IMG_READER}
          )
+IF(USE_ITK)
+FILE(GLOB SOURCES_CREAIMAGEIO_ITK_DLG
+       creaImageIOWxIsimpleDlg.h
+       creaImageIOWxIsimpleDlg.txx
+       )
+ENDIF(USE_ITK)
+         
 #--------------------------------------------
 # The wxWidgets-based components
 if (USE_WXWIDGETS)
@@ -91,7 +103,6 @@ if (USE_WXWIDGETS)
                  creaImageIOExternalGimmick.cpp
                  BlockScopeWxApp.cpp
                  creaImageIOListener.cpp
-                 creaImageIOMultiThreadImageReader.cpp
                  )
        SOURCE_GROUP("Source Files\\GUI" FILES ${SOURCES_CREAIMAGEIO_WX})
 endif(USE_WXWIDGETS)
@@ -156,7 +167,7 @@ SOURCE_GROUP("Source Files\\Readers" FILES ${SOURCES_CREAIMAGEIO_IMG_READER}
                                                                                        ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER})
 SOURCE_GROUP("Source Files\\Tree" FILES ${SOURCES_CREAIMAGEIO_TREE})
 
-
+SOURCE_GROUP("Source Files\\ITK" FILES ${SOURCES_CREAIMAGEIO_ITK_DLG})
 
 
 IF(USE_WXWIDGETS)
@@ -178,6 +189,7 @@ SET( PRIMITIVE_SRCS
  ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
  ${GUI_SRCS}
  ${SOURCES_CREAIMAGEIO_TREE}
+ ${SOURCES_CREAIMAGEIO_ITK_DLG}
 )
 
 
@@ -232,6 +244,7 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
   ${VTK_LIBRARIES}
   ${GDCM_LIBRARIES}
   ${BOOST_LIBRARIES}
+  ${ITK_LIBRARIES}
   sqlite3)
 ELSE(NOT USE_XERCES)
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
@@ -306,10 +319,10 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
   CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 IF (WIN32)
        SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
-       SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/share/gimmick)
+       SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/share/creaImageIO)
 ELSE (WIN32)
        SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
-       SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/gimmick)
+       SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/creaImageIO)
 ENDIF (WIN32)
 CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
 
@@ -319,7 +332,7 @@ CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
 
 OPTION( BUILD_DOXYGEN_DOC "Build doxygen doc ?" OFF)
 IF(BUILD_DOXYGEN_DOC)
-  SUBDIRS(doxygen)
+  ADD_SUBDIRECTORY(doxygen)
 ENDIF(BUILD_DOXYGEN_DOC)
 
 INCLUDE_DIRECTORIES(