X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FCMakeLists.txt;h=9aded620bca6570f3ffc86e377dc9091132da3cc;hb=96ca5a0d7b7ccd6b4291160c19afd48e3207db2a;hp=e8e9aaea75530e418679d078bca0649af69f06f3;hpb=3e7eac431db6401f86374784eaa66ad276af1bac;p=creaImageIO.git

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index e8e9aae..9aded62 100644
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -14,13 +14,13 @@ SET( SRCS
   creaImageIOTreeDescriptor
   creaImageIOTreeLevelDescriptor
   creaImageIOTreeAttributeDescriptor
-  creaImageIOTreeComparators
+
 
   # Image readers
   creaImageIOAbstractImageReader
   creaImageIOVtkImageReader
   creaImageIODicomImageReader
-  creaImageIORFImageReader
+  creaImageIOUltrasonixImageReader
   creaImageIOImageReader
   creaImageIOMultiThreadImageReader
 
@@ -33,6 +33,10 @@ SET( SRCS
   
   # 
   creaImageIOGimmick
+  creaImageIOSynchron
+  creaImageIOTimestampDatabaseHandler
+  creaImageIOListener
+  creaImageIOPACSConnection
 
   # Abstract views
   creaImageIOGimmickView
@@ -43,16 +47,28 @@ SET( SRCS
   creaImageIOWxTreeView
   creaImageIOWxGimmickReaderDialog
   creaImageIOWxGimmickFrame
+  creaImageIOWxGimmickPanel
+  creaImageIOWxGimmickTools
+  creaImageIOWxCustomizeConfigPanel
+  creaImageIOWxListenerPanel
+  creaImageIOWxEditFieldsPanel
+  creaImageIOWxAttributeSelectionPanel
+  creaImageIOWxPACSConnectionPanel
 
   # 
   BlockScopeWxApp
   creaImageIOGimmickReaderDialog
 
+  #  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)
@@ -68,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}
@@ -76,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}
@@ -128,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})
 #-----------------------------------------------------------------------------