*** empty log message ***

[creaImageIO.git] / src2 / CMakeLists.txt

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 68ff6fe8dc94019298e762503ef500a09c16783f..2b4a201172a43a45c039646d7a3707401ba5d05b 100644 (file)
--- 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
@@ -50,7 +50,10 @@ SET( SRCS
   creaImageIOWxGimmickTools
   creaImageIOWxCustomizeConfigPanel
   creaImageIOWxListenerPanel
-
+  creaImageIOWxEditFieldsPanel
+  creaImageIOWxAttributeSelectionPanel
+  creaImageIOWxPACSConnectionPanel
+  creaImageIOWxDescriptorPanel
   # 
   BlockScopeWxApp
   creaImageIOGimmickReaderDialog
@@ -65,7 +68,6 @@ SET( SRCS
 )
 
 
-
 OPTION(${LIBRARY_NAME}_BUILD_SHARED 
   "Build ${LIBRARY_NAME} as a shared library (dynamic) ?" ON)
 IF (${LIBRARY_NAME}_BUILD_SHARED)
@@ -90,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}
@@ -141,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})
@@ -155,4 +165,4 @@ INCLUDE_DIRECTORIES(
 #  ${PROJECT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}/src2
 #  ${PROJECT_SOURCE_DIR}/src2/CppSQLite3
-  )
\ No newline at end of file
+  )