X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FCMakeLists.txt;h=cf4b820121ce18c3328adb712b9fbb37eda90d9c;hb=d53268f864234f0ee96f1b705a7786c094480e32;hp=1ce13d9f87580a3818bfd2bd7eb48a37b4b79716;hpb=6cac83c30fb8c3cd89c41685078eccff6e952a50;p=creaImageIO.git

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 1ce13d9..cf4b820 100644
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -1,58 +1,107 @@
 SET(LIBRARY_NAME creaImageIO2)
 
-SET( SRCS
-  # SQLite 
-  CppSQLite3
-  
-  # wxTreeListCtrl
-#  treelistctrl.cpp
-
-
-  # Attributed tree data structure
-  creaImageIOTree
-  creaImageIOTreeNode
-  creaImageIOTreeDescriptor
-  creaImageIOTreeLevelDescriptor
-  creaImageIOTreeAttributeDescriptor
-  creaImageIOTreeComparators
-
-  # Image readers
-  creaImageIOAbstractImageReader
-  creaImageIOVtkImageReader
-  creaImageIODicomImageReader
-  creaImageIORFImageReader
-  creaImageIOImageReader
-  creaImageIOMultiThreadImageReader
-
-  # Tree Handlers
-  creaImageIOTreeHandler
-  creaImageIOSQLiteTreeHandler
 
+FILE(GLOB SOURCES_CREAIMAGEIO  
+  # SQLite 
+  CppSQLite3.cpp
   # 
-  creaImageIOTreeHandlerImageAdder
-  
-  # 
-  creaImageIOGimmick
+  creaImageIOGimmick.cpp
+  creaImageIOSynchron.cpp
+  creaImageIOPACSConnection.cpp
 
   # Abstract views
-  creaImageIOGimmickView
-  creaImageIOTreeView
+  creaImageIOTreeView.cpp
 
-  # The wxWidgets-based components
-  creaImageIOWxGimmickView
-  creaImageIOWxTreeView
-  creaImageIOWxGimmickReaderDialog
-  creaImageIOWxGimmickFrame
-
-  # 
-  BlockScopeWxApp
-  creaImageIOGimmickReaderDialog
+  # settings
+  creaImageIOSettings.cpp
 
+   BlockScopeWxApp.cpp
+  creaImageIOGimmickReaderDialog.cpp
   #  Viewer
-  creaImageIOWxViewer
+  creaImageIOWxViewer.cpp
+  creaImageIOGimmickView.cpp
+  creaImageIOListener.cpp
+
+ 
+ # Attributed tree data structure
+FILE(GLOB SOURCES_CREAIMAGEIO_TREE
+	  creaImageIOTree.cpp
+	  creaImageIOTreeAttributeDescriptor.cpp
+	  creaImageIOTreeDescriptor.cpp
+	  creaImageIOTreeNode.cpp
+	  creaImageIOTreeLevelDescriptor.cpp
+	    # Tree Handlers
+	  creaImageIOTreeHandler.cpp
+	  creaImageIOTreeHandlerImageAdder.cpp
+	  creaImageIOSQLiteTreeHandler.cpp
+	  )
+ 
+ # Image Readers
+FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
+	  creaImageIOAbstractImageReader.cpp
+	  creaImageIODicomImageReader.cpp
+	  creaImageIOImageReader.cpp
+	  creaImageIOUltrasonixImageReader.cpp
+	  creaImageIOVtkImageReader.cpp
+	  creaImageIOMultiThreadImageReader.cpp
+ 	  )
+
+
+# The wxWidgets-based components
+if (USE_WXWIDGETS)
+FILE(GLOB SOURCES_CREAIMAGEIO_WX
+	  creaImageIOWxGimmickView.cpp
+	  creaImageIOWxTreeView.cpp
+      creaImageIOWxGimmickReaderDialog.cpp
+      creaImageIOWxGimmickFrame.cpp
+      creaImageIOWxGimmickPanel.cpp
+      creaImageIOWxGimmickTools.cpp
+      creaImageIOWxCustomizeConfigPanel.cpp
+      creaImageIOWxListenerPanel.cpp
+      creaImageIOWxEditFieldsPanel.cpp
+	  creaImageIOWxAttributeSelectionPanel.cpp
+	  creaImageIOWxPACSConnectionPanel.cpp
+	  creaImageIOWxDescriptorPanel.cpp
+	  )
+endif()
+
+# Header Files	  
+FILE(GLOB HEADER_CREAIMAGEIO creaImageIOImagePointerHolder.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})
+endif(BUILD_CREA_PACS)
+SOURCE_GROUP("Source Files\\Readers" FILES ${SOURCES_CREAIMAGEIO_IMG_READER})
+SOURCE_GROUP("Source Files\\Tree" FILES ${SOURCES_CREAIMAGEIO_TREE})
+
+
+SET( PRIMITIVE_SRCS
+ ${SOURCES_CREAIMAGEIO}
+ ${HEADER_CREAIMAGEIO}
+ ${SOURCES_CREAIMAGEIO_IMG_READER}
+ ${SOURCES_CREAIMAGEIO_WX}
+ ${SOURCES_CREAIMAGEIO_TREE}
+)
 
+if( BUILD_CREA_PACS)
+	SET (SRCS
+		${PRIMITIVE_SRCS}
+		${SOURCES_CREAIMAGEIO_PACS}
+		${HEADER_CREAIMAGEIO_PACS}
+		)
+else (BUILD_CREA_PACS)
+	SET (SRCS
+		${PRIMITIVE_SRCS}
+		)
+endif (BUILD_CREA_PACS)
 
-)
 
 
 
@@ -68,9 +117,9 @@ crea_DEFINE(CREAIMAGEIO_EXPORT_SYMBOLS)
 ADD_LIBRARY(${LIBRARY_NAME} ${CREAIMAGEIO_BUILD_SHARED} ${SRCS})
 
 
-
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
   ${crea_LIBRARIES}
+  ${creaBruker_LIBRARIES}
   ${WXWIDGETS_LIBRARIES}
   ${VTK_LIBRARIES}
   ${GDCM_LIBRARIES}
@@ -79,11 +128,13 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
 
 #----------------------------------------------------------------------------
 # INSTALLS LIBRARY
-FILE(GLOB HEADERS "*.h")
+FILE(GLOB HEADERS "*.h" "*.txx")
 INSTALL(
   FILES ${HEADERS}
   DESTINATION include/${LIBRARY_NAME}
   )
+  
+
 IF (WIN32)
   SET(CREAIMAGEIO_LIB_PATH bin)
 ELSE (WIN32)
@@ -94,15 +145,20 @@ INSTALL(
   TARGETS ${LIBRARY_NAME} 
   DESTINATION ${CREAIMAGEIO_LIB_PATH})
 
-  
-   # Sets the settings for macro CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE
+     # Sets the settings for macro CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE
   SET(${LIBRARY_NAME}_INSTALL_FOLDER ${LIBRARY_NAME})
   SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME})
   
-  FILE(RELATIVE_PATH 
-    ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS 
-    ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
-    )
+#  FILE(RELATIVE_PATH 
+#    ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS 
+#    ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+#    )
+SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
+    src2
+    win32
+)
+
+
   IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
     SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
   ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
@@ -130,6 +186,14 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
 
   # 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)
+ELSE (WIN32)
+	SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src2/data)
+	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/Shared/gimmick)
+ENDIF (WIN32)
+CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
 
   
 #CREA_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})