std::string vs wxString

[creaImageIO.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b68fae5efeed9ed320e2432be423ad723630950f..b4696dd0df00c0a035f98bb7e19edd1829214ba3 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(LIBRARY_NAME creaImageIO2)
+SET(LIBRARY_NAME creaImageIO)
 
 
 FILE(GLOB SOURCES_CREAIMAGEIO  
@@ -24,8 +24,6 @@ FILE(GLOB SOURCES_CREAIMAGEIO
   creaImageIOListener.cpp
 )
  
- 
- 
  # Attributed tree data structure
 FILE(GLOB SOURCES_CREAIMAGEIO_TREE
          creaImageIOTree.cpp
@@ -42,15 +40,16 @@ 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)
+               creaImageIODicomImageReader2.cpp
+               creaImageIODicomScanner.cpp)
 ENDIF(USE_GDCM2)
 
  # Image Readers
 FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
+         creaImageIOSimpleView.cpp
          creaImageIOAbstractImageReader.cpp
          creaImageIOImageReader.cpp
          creaImageIOUltrasonixImageReader.cpp
@@ -59,10 +58,10 @@ FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
          ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
          )
 
-
 # The wxWidgets-based components
 if (USE_WXWIDGETS)
 FILE(GLOB SOURCES_CREAIMAGEIO_WX
+         creaImageIOWxSimpleDlg.cpp
          creaImageIOWxAttributeSelectionPanel.cpp
          creaImageIOWxCustomizeConfigPanel.cpp
          creaImageIOWxDescriptorPanel.cpp
@@ -119,9 +118,6 @@ else (BUILD_CREA_PACS)
                )
 endif (BUILD_CREA_PACS)
 
-
-
-
 OPTION(${LIBRARY_NAME}_BUILD_SHARED 
   "Build ${LIBRARY_NAME} as a shared library (dynamic) ?" ON)
 IF (${LIBRARY_NAME}_BUILD_SHARED)
@@ -171,7 +167,7 @@ INSTALL(
 #    ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
 #    )
 SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
-    src2
+    src
     win32
 )
 
@@ -197,17 +193,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 +219,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
   )