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

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 1ce13d9..56eb3c8 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,9 @@ SET( SRCS
   
   # 
   creaImageIOGimmick
+  creaImageIOSynchron
+  creaImageIOListener
+  creaImageIOPACSConnection
 
   # Abstract views
   creaImageIOGimmickView
@@ -43,6 +46,13 @@ SET( SRCS
   creaImageIOWxTreeView
   creaImageIOWxGimmickReaderDialog
   creaImageIOWxGimmickFrame
+  creaImageIOWxGimmickPanel
+  creaImageIOWxGimmickTools
+  creaImageIOWxCustomizeConfigPanel
+  creaImageIOWxListenerPanel
+  creaImageIOWxEditFieldsPanel
+  creaImageIOWxAttributeSelectionPanel
+  creaImageIOWxPACSConnectionPanel
 
   # 
   BlockScopeWxApp
@@ -50,12 +60,14 @@ SET( SRCS
 
   #  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)
@@ -71,6 +83,7 @@ ADD_LIBRARY(${LIBRARY_NAME} ${CREAIMAGEIO_BUILD_SHARED} ${SRCS})
 
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
   ${crea_LIBRARIES}
+  ${creaBruker_LIBRARIES}
   ${WXWIDGETS_LIBRARIES}
   ${VTK_LIBRARIES}
   ${GDCM_LIBRARIES}
@@ -79,7 +92,7 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
 
 #----------------------------------------------------------------------------
 # INSTALLS LIBRARY
-FILE(GLOB HEADERS "*.h")
+FILE(GLOB HEADERS "*.h" "*.txx")
 INSTALL(
   FILES ${HEADERS}
   DESTINATION include/${LIBRARY_NAME}
@@ -131,6 +144,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}/bin/Shared/gimmick)
+CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
+
   
 #CREA_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 #-----------------------------------------------------------------------------