X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=0ed51e11c6ae10a2bf9ec610b77dc98f8798f358;hb=4153d65cc0c8b1c3f47f89c1ac7d3efc9a6fa5d0;hp=b68fae5efeed9ed320e2432be423ad723630950f;hpb=3a22e19184c369b130d4caa992a8e98e50c7a0ee;p=creaImageIO.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b68fae5..0ed51e1 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  
@@ -24,8 +24,6 @@ FILE(GLOB SOURCES_CREAIMAGEIO
   creaImageIOListener.cpp
 )
  
- 
- 
  # Attributed tree data structure
 FILE(GLOB SOURCES_CREAIMAGEIO_TREE
 	  creaImageIOTree.cpp
@@ -37,20 +35,22 @@ FILE(GLOB SOURCES_CREAIMAGEIO_TREE
 	  creaImageIOTreeHandler.cpp
 	  creaImageIOTreeHandlerImageAdder.cpp
 	  creaImageIOSQLiteTreeHandler.cpp
+	  creaImageIOOutputModel.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)
+		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 +59,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
@@ -77,9 +77,22 @@ FILE(GLOB SOURCES_CREAIMAGEIO_WX
       creaImageIOWxListenerPanel.cpp
       creaImageIOWxPACSConnectionPanel.cpp
 	  creaImageIOWxTreeView.cpp
+	  creaImageIOWxOutputDlg.cpp
 	  )
 endif()
 
+
+IF(USE_XERCES)
+FILE(GLOB SOURCES_CREAIMAGEIO_OUTPUT
+	  creaImageIOOutputModel.cpp
+	  creaImageIOOutputModelParser.cpp
+	  )
+SOURCE_GROUP("Source Files\\Output" FILES ${SOURCES_CREAIMAGEIO_OUTPUT})	 
+ENDIF(USE_XERCES)
+
+
+
+
 # Header Files	  
 FILE(GLOB HEADER_CREAIMAGEIO creaImageIOImagePointerHolder.h)
 FILE(GLOB SOURCES_CREAIMAGEIO_PACS PACS/*.cpp)
@@ -114,14 +127,18 @@ if( BUILD_CREA_PACS)
 		${HEADER_CREAIMAGEIO_PACS}
 		)
 else (BUILD_CREA_PACS)
+IF(USE_XERCES)
 	SET (SRCS
 		${PRIMITIVE_SRCS}
+		${SOURCES_CREAIMAGEIO_OUTPUT}
 		)
+ELSE(USE_XERCES)
+	SET (SRCS
+		${PRIMITIVE_SRCS}
+		)
+ENDIF(USE_XERCES)
 endif (BUILD_CREA_PACS)
 
-
-
-
 OPTION(${LIBRARY_NAME}_BUILD_SHARED 
   "Build ${LIBRARY_NAME} as a shared library (dynamic) ?" ON)
 IF (${LIBRARY_NAME}_BUILD_SHARED)
@@ -133,7 +150,18 @@ crea_DEFINE(CREAIMAGEIO_EXPORT_SYMBOLS)
 
 ADD_LIBRARY(${LIBRARY_NAME} ${CREAIMAGEIO_BUILD_SHARED} ${SRCS})
 
+IF(USE_QT4)
+TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
+      ${QT_LIBRARIES})
+ENDIF(USE_QT4)
+
+IF(USE_WXWIDGETS)
+TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
+      ${WXWIDGETS_LIBRARIES})
+ENDIF(USE_WXWIDGETS)
+
 
+IF (NOT USE_XERCES)
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
   ${crea_LIBRARIES}
   ${creaBruker_LIBRARIES}
@@ -142,7 +170,19 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
   ${GDCM_LIBRARIES}
   ${BOOST_LIBRARIES}
   sqlite3)
-
+ELSE(NOT USE_XERCES)
+TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
+  ${crea_LIBRARIES}
+  ${creaBruker_LIBRARIES}
+  ${WXWIDGETS_LIBRARIES}
+  ${VTK_LIBRARIES}
+  ${GDCM_LIBRARIES}
+  ${BOOST_LIBRARIES}
+  ${XERCES_LIBRARIES}
+  sqlite3)  
+ENDIF(NOT USE_XERCES)
+  
+  
 #----------------------------------------------------------------------------
 # INSTALLS LIBRARY
 FILE(GLOB HEADERS "*.h" "*.txx")
@@ -171,7 +211,7 @@ INSTALL(
 #    ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
 #    )
 SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
-    src2
+    src
     win32
 )
 
@@ -197,17 +237,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(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/Shared/gimmick)
+	SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
+	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/share/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 +263,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
   )