X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FCMakeLists.txt;h=a31596a2adad6dda500a1a377f2d7b42c44d2063;hb=6b60375e24eb65bde68033daa2618d1f95b5d3ed;hp=83bab4a5091cd2639a5c05ae964530eba64a694b;hpb=66f2d68a504d06b45b4047bd7a445c11889b9fc0;p=creaImageIO.git

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 83bab4a..a31596a 100644
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -14,7 +14,7 @@ SET( SRCS
   creaImageIOTreeDescriptor
   creaImageIOTreeLevelDescriptor
   creaImageIOTreeAttributeDescriptor
-  creaImageIOTreeComparators
+
 
   # Image readers
   creaImageIOAbstractImageReader
@@ -33,7 +33,9 @@ SET( SRCS
   
   # 
   creaImageIOGimmick
-  creaImageIOSynchronizer
+  creaImageIOSynchron
+  creaImageIOListener
+  creaImageIOPACSConnection
 
   # Abstract views
   creaImageIOGimmickView
@@ -44,7 +46,14 @@ SET( SRCS
   creaImageIOWxTreeView
   creaImageIOWxGimmickReaderDialog
   creaImageIOWxGimmickFrame
-
+  creaImageIOWxGimmickPanel
+  creaImageIOWxGimmickTools
+  creaImageIOWxCustomizeConfigPanel
+  creaImageIOWxListenerPanel
+  creaImageIOWxEditFieldsPanel
+  creaImageIOWxAttributeSelectionPanel
+  creaImageIOWxPACSConnectionPanel
+  creaImageIOWxDescriptorPanel
   # 
   BlockScopeWxApp
   creaImageIOGimmickReaderDialog
@@ -52,12 +61,13 @@ 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)
@@ -73,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}
@@ -81,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}
@@ -133,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})
 #-----------------------------------------------------------------------------