X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FCMakeLists.txt;h=2b4a201172a43a45c039646d7a3707401ba5d05b;hb=45ff3187893186d654950081fb4022f608a79734;hp=0f2b35e19cdd843aa52397fe0b7103802639c0c4;hpb=4c2b3017f90a93165a5f436f4f546096a36e0fb1;p=creaImageIO.git

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 0f2b35e..2b4a201 100644
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -14,9 +14,13 @@ SET( SRCS
   creaImageIOTreeDescriptor
   creaImageIOTreeLevelDescriptor
   creaImageIOTreeAttributeDescriptor
-  creaImageIOTreeComparators
+
 
   # Image readers
+  creaImageIOAbstractImageReader
+  creaImageIOVtkImageReader
+  creaImageIODicomImageReader
+  creaImageIOUltrasonixImageReader
   creaImageIOImageReader
   creaImageIOMultiThreadImageReader
 
@@ -29,6 +33,9 @@ SET( SRCS
   
   # 
   creaImageIOGimmick
+  creaImageIOSynchron
+  creaImageIOListener
+  creaImageIOPACSConnection
 
   # Abstract views
   creaImageIOGimmickView
@@ -39,12 +46,28 @@ SET( SRCS
   creaImageIOWxTreeView
   creaImageIOWxGimmickReaderDialog
   creaImageIOWxGimmickFrame
+  creaImageIOWxGimmickPanel
+  creaImageIOWxGimmickTools
+  creaImageIOWxCustomizeConfigPanel
+  creaImageIOWxListenerPanel
+  creaImageIOWxEditFieldsPanel
+  creaImageIOWxAttributeSelectionPanel
+  creaImageIOWxPACSConnectionPanel
+  creaImageIOWxDescriptorPanel
+  # 
+  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)
@@ -60,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}
@@ -68,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}
@@ -119,6 +143,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})
@@ -132,4 +164,5 @@ ENDIF(BUILD_DOXYGEN_DOC)
 INCLUDE_DIRECTORIES(
 #  ${PROJECT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}/src2
+#  ${PROJECT_SOURCE_DIR}/src2/CppSQLite3
   )