From 68dcaeeb31dcf2b3e4f1f4f3f53f7daa1fd4bc37 Mon Sep 17 00:00:00 2001
From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Fri, 22 Oct 2010 09:38:09 +0000
Subject: [PATCH] bug correction

---
 src/CMakeLists.txt | 126 +++++++++++++++++++++++++--------------------
 1 file changed, 70 insertions(+), 56 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 05d6b09..d7b27ba 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,19 +39,24 @@ 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
+
 FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
 	  creaImageIOSimpleView.cpp
 	  creaImageIOAbstractImageReader.cpp
@@ -54,38 +64,39 @@ FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
 	  creaImageIOUltrasonixImageReader.cpp
 	  creaImageIOVtkImageReader.cpp
 	  creaImageIOQMultiThreadImageReader.cpp
-	  	  ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
+	  ${SOURCES_CREAIMAGEIO_IMG_DICOM_READER}
  	  )
-
+#--------------------------------------------
 # 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
-	 creaImageIOMultiThreadImageReader.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
+		  creaImageIOMultiThreadImageReader.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
@@ -101,31 +112,35 @@ 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)
 
 
 
 
 # Header Files	  
-FILE(GLOB HEADER_CREAIMAGEIO #creaImageIOImagePointerHolder.h  CppSQLite3.h)
+FILE(GLOB HEADER_CREAIMAGEIO creaImageIOImagePointerHolder.h  CppSQLite3.h)
 #*.h)
 FILE(GLOB SOURCES_CREAIMAGEIO_PACS PACS/*.cpp)
 FILE(GLOB HEADER_CREAIMAGEIO_PACS PACS/*.h)
@@ -310,5 +325,4 @@ ENDIF(BUILD_DOXYGEN_DOC)
 INCLUDE_DIRECTORIES(
 #  ${PROJECT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}/src
-
   )
-- 
2.47.1