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

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 6f3924e..2b4a201 100644
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -14,7 +14,7 @@ SET( SRCS
   creaImageIOTreeDescriptor
   creaImageIOTreeLevelDescriptor
   creaImageIOTreeAttributeDescriptor
-  creaImageIOTreeComparators
+
 
   # Image readers
   creaImageIOAbstractImageReader
@@ -34,7 +34,6 @@ SET( SRCS
   # 
   creaImageIOGimmick
   creaImageIOSynchron
-  creaImageIOTimestampDatabaseHandler
   creaImageIOListener
   creaImageIOPACSConnection
 
@@ -54,7 +53,7 @@ SET( SRCS
   creaImageIOWxEditFieldsPanel
   creaImageIOWxAttributeSelectionPanel
   creaImageIOWxPACSConnectionPanel
-
+  creaImageIOWxDescriptorPanel
   # 
   BlockScopeWxApp
   creaImageIOGimmickReaderDialog
@@ -144,9 +143,13 @@ 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}/data)
+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})