X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FCMakeLists.txt;h=27d93ce706eedc70daee54e54cdcdd8f1e0a73a9;hb=3213e0d7adb70f52d723a5b7065f4780b6c9e451;hp=9ae8fc681c667bc1bc28ff0d96fb818d22de82bc;hpb=1828180a7169f3de7297ba87fb564b99832b7a43;p=creaImageIO.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9ae8fc6..27d93ce 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,7 @@
 SET(LIBRARY_NAME creaImageIO)
 
-
+#-----------------------------------------
+#SOURCES
 FILE(GLOB SOURCES_CREAIMAGEIO  
   # SQLite 
   CppSQLite3.cpp
@@ -15,13 +16,17 @@ FILE(GLOB SOURCES_CREAIMAGEIO
   # settings
   creaImageIOSettings.cpp
   creaImageIOGimmickView.cpp
-)
+  )
+#--------------------------------------------
+
 IF(USE_WXWIDGETS)
- FILE(GLOB SOURCES_CREAIMAGEIO_DIALOG  
-   creaImageIOGimmickReaderDialog.cpp
-   )
-   SOURCE_GROUP("Source Files\\Reader Dialog" FILES ${SOURCES_CREAIMAGEIO_DIALOG})
+	 FILE(GLOB SOURCES_CREAIMAGEIO_DIALOG  
+	   creaImageIOGimmickReaderDialog.cpp
+	   )
+   	SOURCE_GROUP("Source Files\\Reader Dialog" FILES ${SOURCES_CREAIMAGEIO_DIALOG})
 ENDIF(USE_WXWIDGETS)
+
+#--------------------------------------------
  # Attributed tree data structure
 FILE(GLOB SOURCES_CREAIMAGEIO_TREE
 	  creaImageIOTree.cpp
@@ -34,62 +39,83 @@ FILE(GLOB SOURCES_CREAIMAGEIO_TREE
 	  creaImageIOTreeHandlerImageAdder.cpp
 	  creaImageIOSQLiteTreeHandler.cpp
 	  creaImageIOOutputModel.cpp
-	  )
+          )
+
+#--------------------------------------------
+ # Image Readers
 IF(USE_GDCM)
- FILE(GLOB SOURCES_CREAIMAGEIO_IMG_DICOM_READER
-		creaImageIODicomImageReader.cpp)
+	 FILE(GLOB SOURCES_CREAIMAGEIO_IMG_DICOM_READER
+			creaImageIODicomImageReader.cpp
+		        )
 ENDIF(USE_GDCM)
 	  
 IF(USE_GDCM2)
- FILE(GLOB SOURCES_CREAIMAGEIO_IMG_DICOM_READER
-		creaImageIODicomImageReader2.cpp
-		creaImageIODicomScanner.cpp)
+	 FILE(GLOB SOURCES_CREAIMAGEIO_IMG_DICOM_READER
+			creaImageIODicomImageReader2.cpp
+			creaImageIODicomScanner.cpp
+		        )
 ENDIF(USE_GDCM2)
 
- # Image Readers
+IF (USE_WXWIDGETS)
+	FILE(GLOB SOURCES_CREAIMAGEIO_MULTI_IMG_READER   creaImageIOMultiThreadImageReader.cpp)
+ELSEIF(USE_QT4)
+	FILE(GLOB SOURCES_CREAIMAGEIO_MULTI_IMG_READER   creaImageIOQMultiThreadImageReader.cpp)
+ENDIF()
+
 FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
 	  creaImageIOSimpleView.cpp
 	  creaImageIOAbstractImageReader.cpp
 	  creaImageIOImageReader.cpp
 	  creaImageIOUltrasonixImageReader.cpp
 	  creaImageIOVtkImageReader.cpp
-	  creaImageIOMultiThreadImageReader.cpp
 	  ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
+	  ${SOURCES_CREAIMAGEIO_MULTI_IMG_READER}
  	  )
-
+IF(USE_ITK)
+FILE(GLOB SOURCES_CREAIMAGEIO_ITK_DLG
+	creaImageIOWxIsimpleDlg.h
+	creaImageIOWxIsimpleDlg.hpp
+	creaImageIOWxAnySimpleDlg.h
+	creaImageIOWxAnySimpleDlg.cpp
+	)
+ENDIF(USE_ITK)
+	  
+#--------------------------------------------
 # The wxWidgets-based components
 if (USE_WXWIDGETS)
-FILE(GLOB SOURCES_CREAIMAGEIO_WX
-	  creaImageIOWxSimpleDlg.cpp
-	  creaImageIOWxAttributeSelectionPanel.cpp
-	  creaImageIOWxCustomizeConfigPanel.cpp
-	  creaImageIOWxDescriptorPanel.cpp
-	  creaImageIOWxEditFieldsPanel.cpp
-	  creaImageIOWxExportDlg.cpp
-	  creaImageIOWxDumpPanel.cpp
-	  creaImageIOWxGimmickView.cpp
-	  creaImageIOWxGimmickReaderDialog.cpp
-      creaImageIOWxGimmickFrame.cpp
-      creaImageIOWxGimmickPanel.cpp
-      creaImageIOWxGimmickTools.cpp
-      creaImageIOWxListenerPanel.cpp
-      creaImageIOWxPACSConnectionPanel.cpp
-	  creaImageIOWxTreeView.cpp
-	  creaImageIOWxOutputDlg.cpp
-	  #  Viewer
-	  creaImageIOWxViewer.cpp
-	  creaImageIOExternalGimmick.cpp
-	  BlockScopeWxApp.cpp
-	 creaImageIOListener.cpp
-    )
-	  SOURCE_GROUP("Source Files\\GUI" FILES ${SOURCES_CREAIMAGEIO_WX})
-endif()
-
+	FILE(GLOB SOURCES_CREAIMAGEIO_WX
+		  creaImageIOWxSimpleDlg.cpp
+		  creaImageIOWxAttributeSelectionPanel.cpp
+		  creaImageIOWxCustomizeConfigPanel.cpp
+		  creaImageIOWxDescriptorPanel.cpp
+		  creaImageIOWxEditFieldsPanel.cpp
+		  creaImageIOWxExportDlg.cpp
+		  creaImageIOWxDumpPanel.cpp
+		  creaImageIOWxGimmickView.cpp
+		  creaImageIOWxGimmickReaderDialog.cpp
+		  creaImageIOWxGimmickFrame.cpp
+		  creaImageIOWxGimmickPanel.cpp
+		  creaImageIOWxGimmickTools.cpp
+		  creaImageIOWxListenerPanel.cpp
+		  creaImageIOWxPACSConnectionPanel.cpp
+		  creaImageIOWxTreeView.cpp
+		  creaImageIOWxOutputDlg.cpp
+		  #  Viewer
+		  creaImageIOWxViewer.cpp
+		  creaImageIOExternalGimmick.cpp
+		  BlockScopeWxApp.cpp
+		  creaImageIOListener.cpp
+		  )
+	SOURCE_GROUP("Source Files\\GUI" FILES ${SOURCES_CREAIMAGEIO_WX})
+endif(USE_WXWIDGETS)
+
+#--------------------------------------------
 # USE QT, need to transform files (moc mechanism)
 IF (USE_QT4)
 	#cpp
 	FILE(GLOB QT_CPP 
-		QtGUI/*.cpp QtGUI/*.cxx
+		QtGUI/*.cpp 
+		QtGUI/*.cxx
 		)
 	
 	# headers
@@ -99,24 +125,28 @@ IF (USE_QT4)
 		)
 	
 
-  QT4_WRAP_CPP(MOC_SOURCES ${QT4_HEADERS_TO_WRAP})
-  SOURCE_GROUP("Source Files\\GUI" FILES ${MOC_SOURCES})
+  	QT4_WRAP_CPP(MOC_SOURCES 
+			${QT4_HEADERS_TO_WRAP}
+			)
+  	SOURCE_GROUP("Source Files\\GUI" FILES 
+			${MOC_SOURCES}
+		    )
   
   
-  # UI
-  FILE(GLOB UI_FILES QtGUI/*.ui)
-  QT4_WRAP_UI(UI_SOURCES ${UI_FILES})
-  #SOURCE_GROUP("UI Files" FILES ${UI_FILES})
-  SOURCE_GROUP("Source Files\\GUI" FILES ${UI_SOURCES})
+	# UI
+	FILE(GLOB UI_FILES QtGUI/*.ui)
+	QT4_WRAP_UI(UI_SOURCES ${UI_FILES})
+	#SOURCE_GROUP("UI Files" FILES ${UI_FILES})
+	SOURCE_GROUP("Source Files\\GUI" FILES ${UI_SOURCES})
 ENDIF(USE_QT4)
 
 
 IF(USE_XERCES)
-FILE(GLOB SOURCES_CREAIMAGEIO_OUTPUT
-	  creaImageIOOutputModel.cpp
-	  creaImageIOOutputModelParser.cpp
-	  )
-SOURCE_GROUP("Source Files\\Output" FILES ${SOURCES_CREAIMAGEIO_OUTPUT})	 
+	FILE(GLOB SOURCES_CREAIMAGEIO_OUTPUT
+		  creaImageIOOutputModel.cpp
+		  creaImageIOOutputModelParser.cpp
+		  )
+	SOURCE_GROUP("Source Files\\Output" FILES ${SOURCES_CREAIMAGEIO_OUTPUT})	 
 ENDIF(USE_XERCES)
 
 
@@ -124,6 +154,7 @@ ENDIF(USE_XERCES)
 
 # Header Files	  
 FILE(GLOB HEADER_CREAIMAGEIO creaImageIOImagePointerHolder.h  CppSQLite3.h)
+#*.h)
 FILE(GLOB SOURCES_CREAIMAGEIO_PACS PACS/*.cpp)
 FILE(GLOB HEADER_CREAIMAGEIO_PACS PACS/*.h)
 
@@ -138,7 +169,7 @@ SOURCE_GROUP("Source Files\\Readers" FILES ${SOURCES_CREAIMAGEIO_IMG_READER}
 											${SOURCES_CREAIMAGEIO_IMG_DICOM_READER})
 SOURCE_GROUP("Source Files\\Tree" FILES ${SOURCES_CREAIMAGEIO_TREE})
 
-
+SOURCE_GROUP("Source Files\\ITK" FILES ${SOURCES_CREAIMAGEIO_ITK_DLG})
 
 
 IF(USE_WXWIDGETS)
@@ -160,6 +191,7 @@ SET( PRIMITIVE_SRCS
  ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
  ${GUI_SRCS}
  ${SOURCES_CREAIMAGEIO_TREE}
+ ${SOURCES_CREAIMAGEIO_ITK_DLG}
 )
 
 
@@ -214,6 +246,7 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
   ${VTK_LIBRARIES}
   ${GDCM_LIBRARIES}
   ${BOOST_LIBRARIES}
+  ${ITK_LIBRARIES}
   sqlite3)
 ELSE(NOT USE_XERCES)
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
@@ -288,10 +321,10 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
   CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 IF (WIN32)
 	SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
-	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/share/gimmick)
+	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/share/creaImageIO)
 ELSE (WIN32)
 	SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
-	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/gimmick)
+	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/creaImageIO)
 ENDIF (WIN32)
 CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
 
@@ -301,11 +334,10 @@ CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
 
 OPTION( BUILD_DOXYGEN_DOC "Build doxygen doc ?" OFF)
 IF(BUILD_DOXYGEN_DOC)
-  SUBDIRS(doxygen)
+  ADD_SUBDIRECTORY(doxygen)
 ENDIF(BUILD_DOXYGEN_DOC)
 
 INCLUDE_DIRECTORIES(
 #  ${PROJECT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}/src
-
   )