QT interface

[creaImageIO.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1cff20311d1d3ccea0d62bd26a989cba51bbaa98..618ca30d54abd6e92d133cb803443278e2f1bfbb 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,6 +35,7 @@ FILE(GLOB SOURCES_CREAIMAGEIO_TREE
          creaImageIOTreeHandler.cpp
          creaImageIOTreeHandlerImageAdder.cpp
          creaImageIOSQLiteTreeHandler.cpp
+         creaImageIOOutputModel.cpp
          )
 IF(USE_GDCM)
  FILE(GLOB SOURCES_CREAIMAGEIO_IMG_DICOM_READER
@@ -76,9 +77,36 @@ 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
@@ -92,14 +120,13 @@ 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})
@@ -109,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}
@@ -180,7 +223,7 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
   sqlite3)  
 ENDIF(NOT USE_XERCES)
   
-  
+ 
 #----------------------------------------------------------------------------
 # INSTALLS LIBRARY
 FILE(GLOB HEADERS "*.h" "*.txx")
@@ -190,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} 
@@ -222,14 +261,16 @@ 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})
   
@@ -243,7 +284,7 @@ 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/Shared/gimmick)
+       SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/share/gimmick)
 ELSE (WIN32)
        SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
        SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/gimmick)
@@ -262,5 +303,5 @@ ENDIF(BUILD_DOXYGEN_DOC)
 INCLUDE_DIRECTORIES(
 #  ${PROJECT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}/src
-#  ${PROJECT_SOURCE_DIR}/src/CppSQLite3
+
   )