X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FCMakeLists.txt;h=6f3924e75c50c9fa0e48b90fa84aa92611e9d419;hb=0bc29481ba22ca1011e6d655752a0dc69ea7dd55;hp=41e2ed0cc29c6011c822d744245f8b9a3cb5d584;hpb=cbf693fa62cd51f4ca5c881838bbb609edc447b0;p=creaImageIO.git

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 41e2ed0..6f3924e 100644
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -17,6 +17,10 @@ SET( SRCS
   creaImageIOTreeComparators
 
   # Image readers
+  creaImageIOAbstractImageReader
+  creaImageIOVtkImageReader
+  creaImageIODicomImageReader
+  creaImageIOUltrasonixImageReader
   creaImageIOImageReader
   creaImageIOMultiThreadImageReader
 
@@ -25,28 +29,46 @@ SET( SRCS
   creaImageIOSQLiteTreeHandler
 
   # 
-  creaImageIOImageFinder
+  creaImageIOTreeHandlerImageAdder
   
   # 
   creaImageIOGimmick
-#  creaImageIODicomNode
-#  creaImageIODicomNodeComparators
-#  creaImageIODicomNodeTypeDescription
-#  creaImageIODicomDatabaseStructure
-#  creaImageIODicomDatabase
-#  creaImageIOField
+  creaImageIOSynchron
+  creaImageIOTimestampDatabaseHandler
+  creaImageIOListener
+  creaImageIOPACSConnection
+
+  # Abstract views
+  creaImageIOGimmickView
+  creaImageIOTreeView
+
+  # The wxWidgets-based components
+  creaImageIOWxGimmickView
+  creaImageIOWxTreeView
+  creaImageIOWxGimmickReaderDialog
+  creaImageIOWxGimmickFrame
+  creaImageIOWxGimmickPanel
+  creaImageIOWxGimmickTools
+  creaImageIOWxCustomizeConfigPanel
+  creaImageIOWxListenerPanel
+  creaImageIOWxEditFieldsPanel
+  creaImageIOWxAttributeSelectionPanel
+  creaImageIOWxPACSConnectionPanel
 
-  # The Gimmick! widgets
-#  creaImageIOWxGimmick
-#  creaImageIOWxGimmickSettings
-#  creaImageIOWxGimmickFieldsView
+  # 
+  BlockScopeWxApp
+  creaImageIOGimmickReaderDialog
 
-#  creaImageIOWxGimmickDialog
+  #  Viewer
+  creaImageIOWxViewer
+  creaImageIOImagePointerHolder.h
+  
+  # settings
+  creaImageIOSettings
 
 )
 
 
-
 OPTION(${LIBRARY_NAME}_BUILD_SHARED 
   "Build ${LIBRARY_NAME} as a shared library (dynamic) ?" ON)
 IF (${LIBRARY_NAME}_BUILD_SHARED)
@@ -62,6 +84,7 @@ ADD_LIBRARY(${LIBRARY_NAME} ${CREAIMAGEIO_BUILD_SHARED} ${SRCS})
 
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
   ${crea_LIBRARIES}
+  ${creaBruker_LIBRARIES}
   ${WXWIDGETS_LIBRARIES}
   ${VTK_LIBRARIES}
   ${GDCM_LIBRARIES}
@@ -70,7 +93,7 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
 
 #----------------------------------------------------------------------------
 # INSTALLS LIBRARY
-FILE(GLOB HEADERS "*.h")
+FILE(GLOB HEADERS "*.h" "*.txx")
 INSTALL(
   FILES ${HEADERS}
   DESTINATION include/${LIBRARY_NAME}
@@ -122,6 +145,10 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
   # Invoke the advanced macro
   CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 
+SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src2/data)
+SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/data)
+CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
+
   
 #CREA_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 #-----------------------------------------------------------------------------
@@ -134,4 +161,5 @@ ENDIF(BUILD_DOXYGEN_DOC)
 INCLUDE_DIRECTORIES(
 #  ${PROJECT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}/src2
+#  ${PROJECT_SOURCE_DIR}/src2/CppSQLite3
   )