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

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 0ced6db..2b4a201 100644
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -14,7 +14,7 @@ SET( SRCS
   creaImageIOTreeDescriptor
   creaImageIOTreeLevelDescriptor
   creaImageIOTreeAttributeDescriptor
-  creaImageIOTreeComparators
+
 
   # Image readers
   creaImageIOAbstractImageReader
@@ -34,8 +34,8 @@ SET( SRCS
   # 
   creaImageIOGimmick
   creaImageIOSynchron
-  creaImageIOTimestampDatabaseHandler
   creaImageIOListener
+  creaImageIOPACSConnection
 
   # Abstract views
   creaImageIOGimmickView
@@ -51,7 +51,9 @@ SET( SRCS
   creaImageIOWxCustomizeConfigPanel
   creaImageIOWxListenerPanel
   creaImageIOWxEditFieldsPanel
-
+  creaImageIOWxAttributeSelectionPanel
+  creaImageIOWxPACSConnectionPanel
+  creaImageIOWxDescriptorPanel
   # 
   BlockScopeWxApp
   creaImageIOGimmickReaderDialog
@@ -66,7 +68,6 @@ SET( SRCS
 )
 
 
-
 OPTION(${LIBRARY_NAME}_BUILD_SHARED 
   "Build ${LIBRARY_NAME} as a shared library (dynamic) ?" ON)
 IF (${LIBRARY_NAME}_BUILD_SHARED)
@@ -91,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}
@@ -142,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})
@@ -156,4 +165,4 @@ INCLUDE_DIRECTORIES(
 #  ${PROJECT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}/src2
 #  ${PROJECT_SOURCE_DIR}/src2/CppSQLite3
-  )
\ No newline at end of file
+  )