move directory

[creaImageIO.git] / src2 / CMakeLists.txt

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 6c0c6f1d9decdcdb84dd01ea7d776913c8c635e3..b68fae5efeed9ed320e2432be423ad723630950f 100644 (file)
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -4,31 +4,27 @@ SET(LIBRARY_NAME creaImageIO2)
 FILE(GLOB SOURCES_CREAIMAGEIO  
   # SQLite 
   CppSQLite3.cpp
-  
-
-  
   # 
   creaImageIOGimmick.cpp
   creaImageIOSynchron.cpp
-  creaImageIOListener.cpp
   creaImageIOPACSConnection.cpp
 
   # Abstract views
-  creaImageIOGimmickView.cpp
   creaImageIOTreeView.cpp
 
-  
-  # 
-  BlockScopeWxApp.cpp
-  creaImageIOGimmickReaderDialog.cpp
+  # settings
+  creaImageIOSettings.cpp
 
+   BlockScopeWxApp.cpp
+  creaImageIOGimmickReaderDialog.cpp
+  creaImageIOExternalGimmick.cpp
   #  Viewer
   creaImageIOWxViewer.cpp
-  
-  
-  # settings
-  creaImageIOSettings.cpp
-  )
+  creaImageIOGimmickView.cpp
+  creaImageIOListener.cpp
+)
+ 
+ 
  
  # Attributed tree data structure
 FILE(GLOB SOURCES_CREAIMAGEIO_TREE
@@ -42,33 +38,48 @@ 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
-         creaImageIOMultiThreadImageReader.cpp
          creaImageIOUltrasonixImageReader.cpp
          creaImageIOVtkImageReader.cpp
-         )
+         creaImageIOMultiThreadImageReader.cpp
+         ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
+         )
 
 
 # The wxWidgets-based components
+if (USE_WXWIDGETS)
 FILE(GLOB SOURCES_CREAIMAGEIO_WX
+         creaImageIOWxAttributeSelectionPanel.cpp
+         creaImageIOWxCustomizeConfigPanel.cpp
+         creaImageIOWxDescriptorPanel.cpp
+         creaImageIOWxEditFieldsPanel.cpp
+         creaImageIOWxExportDlg.cpp
+         creaImageIOWxDumpPanel.cpp
          creaImageIOWxGimmickView.cpp
-         creaImageIOWxTreeView.cpp
-      creaImageIOWxGimmickReaderDialog.cpp
+         creaImageIOWxGimmickReaderDialog.cpp
       creaImageIOWxGimmickFrame.cpp
       creaImageIOWxGimmickPanel.cpp
       creaImageIOWxGimmickTools.cpp
-      creaImageIOWxCustomizeConfigPanel.cpp
       creaImageIOWxListenerPanel.cpp
-      creaImageIOWxEditFieldsPanel.cpp
-         creaImageIOWxAttributeSelectionPanel.cpp
-         creaImageIOWxPACSConnectionPanel.cpp
-         creaImageIOWxDescriptorPanel.cpp
+      creaImageIOWxPACSConnectionPanel.cpp
+         creaImageIOWxTreeView.cpp
          )
+endif()
+
 # Header Files   
 FILE(GLOB HEADER_CREAIMAGEIO creaImageIOImagePointerHolder.h)
 FILE(GLOB SOURCES_CREAIMAGEIO_PACS PACS/*.cpp)
@@ -82,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})
 
 
@@ -90,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}
 )
@@ -195,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})