]> Creatis software - creaImageIO.git/blobdiff - src/CMakeLists.txt
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
QT interface
[creaImageIO.git] / src / CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b68fae5efeed9ed320e2432be423ad723630950f..618ca30d54abd6e92d133cb803443278e2f1bfbb 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
@@ -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,18 +77,56 @@ FILE(GLOB SOURCES_CREAIMAGEIO_WX
       creaImageIOWxListenerPanel.cpp
       creaImageIOWxPACSConnectionPanel.cpp
          creaImageIOWxTreeView.cpp
+         creaImageIOWxOutputDlg.cpp
          )
+         SOURCE_GROUP("Source Files\\GUI" FILES ${SOURCES_CREAIMAGEIO_WX})
 endif()
 
+# USE QT, need to transform files (moc mechanism)
+IF (USE_QT4)
+       #cpp
+       FILE(GLOB QT_CPP 
+               QtGUI/*.cpp QtGUI/*.cxx
+               )
+       
+       # headers
+       SET(QT4_HEADERS_TO_WRAP
+               QtGUI/creaimageioqtreeview.h
+               QtGUI/mainwindow.h
+               )
+       
+
+  QT4_WRAP_CPP(MOC_SOURCES ${QT4_HEADERS_TO_WRAP})
+  SOURCE_GROUP("Source Files\\GUI" FILES ${MOC_SOURCES})
+  
+  
+  # UI
+  FILE(GLOB UI_FILES QtGUI/*.ui)
+  QT4_WRAP_UI(UI_SOURCES ${UI_FILES})
+  #SOURCE_GROUP("UI Files" FILES ${UI_FILES})
+  SOURCE_GROUP("Source Files\\GUI" FILES ${UI_SOURCES})
+ENDIF(USE_QT4)
+
+
+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 HEADER_CREAIMAGEIO creaImageIOImagePointerHolder.h  CppSQLite3.h)
 FILE(GLOB SOURCES_CREAIMAGEIO_PACS PACS/*.cpp)
 FILE(GLOB HEADER_CREAIMAGEIO_PACS PACS/*.h)
 
 
 SOURCE_GROUP("Source Files" FILES ${SOURCES_CREAIMAGEIO})
 SOURCE_GROUP("Header Files" FILES ${HEADER_CREAIMAGEIO})
-SOURCE_GROUP("Source Files\\GUI" FILES ${SOURCES_CREAIMAGEIO_WX})
 if(BUILD_CREA_PACS)
        SOURCE_GROUP("Source Files\\PACS" FILES ${SOURCES_CREAIMAGEIO_PACS})
        SOURCE_GROUP("Header Files\\PACS" FILES ${HEADER_CREAIMAGEIO_PACS})
@@ -98,15 +136,31 @@ SOURCE_GROUP("Source Files\\Readers" FILES ${SOURCES_CREAIMAGEIO_IMG_READER}
 SOURCE_GROUP("Source Files\\Tree" FILES ${SOURCES_CREAIMAGEIO_TREE})
 
 
+
+
+IF(USE_WXWIDGETS)
+SET( GUI_SRCS
+        ${SOURCES_CREAIMAGEIO_WX}
+        )
+ELSE(USE_WXWIDGETS)
+SET( GUI_SRCS
+        ${QT_CPP}
+        ${UI_SOURCES}
+        ${MOC_SOURCES}
+        )
+ENDIF(USE_WXWIDGETS)
 SET( PRIMITIVE_SRCS
  ${SOURCES_CREAIMAGEIO}
  ${HEADER_CREAIMAGEIO}
  ${SOURCES_CREAIMAGEIO_IMG_READER}
  ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
- ${SOURCES_CREAIMAGEIO_WX}
+ ${GUI_SRCS}
  ${SOURCES_CREAIMAGEIO_TREE}
 )
 
+
+#if ( ${CMAKE_EXE_LINKER_FLAGS} MATCHES "message:x64")message("charlie ${CMAKE_SYSTEM_PROCESSOR}")endif()
+
 if( BUILD_CREA_PACS)
        SET (SRCS
                ${PRIMITIVE_SRCS}
@@ -114,14 +168,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 +191,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 +211,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")
@@ -152,11 +233,7 @@ INSTALL(
   )
   
 
-IF (WIN32)
-  SET(CREAIMAGEIO_LIB_PATH bin)
-ELSE (WIN32)
-  SET(CREAIMAGEIO_LIB_PATH lib)
-ENDIF(WIN32)
+SET(CREAIMAGEIO_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
 
 INSTALL(
   TARGETS ${LIBRARY_NAME} 
@@ -171,7 +248,7 @@ INSTALL(
 #    ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
 #    )
 SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
-    src2
+    src
     win32
 )
 
@@ -184,30 +261,32 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
       ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH})
   ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
 
+
+
+  SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${CMAKE_CREA_LIB_PATH} )
+
   IF(UNIX)
     SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
       ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
-    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
   ELSE(UNIX)
     SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
       ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
-    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
   ENDIF(UNIX)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME})
   
   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 +302,6 @@ ENDIF(BUILD_DOXYGEN_DOC)
 
 INCLUDE_DIRECTORIES(
 #  ${PROJECT_BINARY_DIR}
-  ${PROJECT_SOURCE_DIR}/src2
-#  ${PROJECT_SOURCE_DIR}/src2/CppSQLite3
+  ${PROJECT_SOURCE_DIR}/src
+
   )
Input/Output medical images