X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=c8726b77f03f30233a38bde2a5db6178e02c7f8a;hb=6b7ccc72c2f9cee3979d9360a55eaa65aeea8a17;hp=27d93ce706eedc70daee54e54cdcdd8f1e0a73a9;hpb=d9a70eeba314e0295337364bcd88cf97cdf06b51;p=creaImageIO.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 27d93ce..c8726b7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,28 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+
 SET(LIBRARY_NAME creaImageIO)
 
 #-----------------------------------------
@@ -58,12 +83,13 @@ ENDIF(USE_GDCM2)
 
 IF (USE_WXWIDGETS)
 	FILE(GLOB SOURCES_CREAIMAGEIO_MULTI_IMG_READER   creaImageIOMultiThreadImageReader.cpp)
-ELSEIF(USE_QT4)
-	FILE(GLOB SOURCES_CREAIMAGEIO_MULTI_IMG_READER   creaImageIOQMultiThreadImageReader.cpp)
+#ELSEIF(USE_QT4)
+	#FILE(GLOB SOURCES_CREAIMAGEIO_MULTI_IMG_READER   creaImageIOQMultiThreadImageReader.cpp)
 ENDIF()
 
 FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
 	  creaImageIOSimpleView.cpp
+	  creaImageIOUnMosaicVtkImageData.cpp
 	  creaImageIOAbstractImageReader.cpp
 	  creaImageIOImageReader.cpp
 	  creaImageIOUltrasonixImageReader.cpp
@@ -107,40 +133,59 @@ if (USE_WXWIDGETS)
 		  creaImageIOListener.cpp
 		  )
 	SOURCE_GROUP("Source Files\\GUI" FILES ${SOURCES_CREAIMAGEIO_WX})
+	
+	IF(USE_ITK)
+FILE(GLOB SOURCES_CREAIMAGEIO_ITK_DLG
+	creaImageIOWxIsimpleDlg.h
+	creaImageIOWxIsimpleDlg.hpp
+	creaImageIOWxAnySimpleDlg.h
+	creaImageIOWxAnySimpleDlg.cpp
+	)
+ENDIF(USE_ITK)
+	  
 endif(USE_WXWIDGETS)
 
+
+
+
 #--------------------------------------------
 # USE QT, need to transform files (moc mechanism)
+
 IF (USE_QT4)
+
+#ADD_SUBDIRECTORY(Qt)
+	# UI
+	FILE(GLOB UI_FILES Qt/*.ui)
+	QT4_WRAP_UI(UI_SOURCES ${UI_FILES})
+	SOURCE_GROUP("Source Files\\UI Files" FILES ${UI_FILES})
+	SOURCE_GROUP("Source Files\\Qt Generated Files" FILES ${UI_SOURCES})
+
 	#cpp
-	FILE(GLOB QT_CPP 
-		QtGUI/*.cpp 
-		QtGUI/*.cxx
+	FILE(GLOB QT_CPP Qt/*.cpp
+		#creaImageIOQtGimmickReaderDialog.cpp 
 		)
 	
 	# headers
-	SET(QT4_HEADERS_TO_WRAP
-		QtGUI/creaimageioqtreeview.h
-		QtGUI/creaImageIOQTGimmickReaderDialog.h
+	FILE(GLOB QT4_HEADERS_TO_WRAP Qt/*.h
+		#creaImageIOQtGimmickReaderDialog.h
 		)
-	
-
-  	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})
+	#	FILE(GLOB UI_FILES *.ui)
+	#   QT4_WRAP_UI(UI_SOURCES ${UI_FILES})
+	# SOURCE_GROUP("UI Files" FILES ${UI_FILES})
+	# SOURCE_GROUP("Qt Generated Files" FILES ${UI_SOURCES})
+#	FILE(GLOB UI_FILES creaImageIOQtGimmickReaderDialog.ui)
+#	QT4_WRAP_UI(UI_SOURCES_H ${UI_FILES} OPTIONS -o ${PROJECT_BINARY_DIR}/src)
+	 QT4_WRAP_CPP(QT_MOC_CPP ${QT4_HEADERS_TO_WRAP})
+  
+   # FILE(GLOB ${LIBRARY_NAME}_HEADERS "*.h" "*.txx" "${PROJECT_BINARY_DIR}/src/*.h")
+	# MEssage(STATUS" qt files = ${QT_MOC_CPP}")
+	 SOURCE_GROUP("Source Files\\GUI" FILES ${QT_MOC_CPP} ${QT_CPP} )
+	# INCLUDE_DIRECTORIES ( ${PROJECT_BINARY_DIR})
+	SOURCE_GROUP("Source Files\\GUI" FILES ${UI_SOURCES_H} ${UI_FILES})
+	SOURCE_GROUP("Header Files" FILES ${QT4_HEADERS_TO_WRAP})
 ENDIF(USE_QT4)
 
-
 IF(USE_XERCES)
 	FILE(GLOB SOURCES_CREAIMAGEIO_OUTPUT
 		  creaImageIOOutputModel.cpp
@@ -158,9 +203,10 @@ FILE(GLOB HEADER_CREAIMAGEIO creaImageIOImagePointerHolder.h  CppSQLite3.h)
 FILE(GLOB SOURCES_CREAIMAGEIO_PACS PACS/*.cpp)
 FILE(GLOB HEADER_CREAIMAGEIO_PACS PACS/*.h)
 
-
+FILE(GLOB QT4_HEADERS		creaImageIOQtGimmickReaderDialog.h		)
+MEssage(STATUS" qt files = ${QT4_HEADERS}")
 SOURCE_GROUP("Source Files" FILES ${SOURCES_CREAIMAGEIO})
-SOURCE_GROUP("Header Files" FILES ${HEADER_CREAIMAGEIO})
+SOURCE_GROUP("Header Files" FILES ${HEADER_CREAIMAGEIO} ${QT4_HEADERS})
 if(BUILD_CREA_PACS)
 	SOURCE_GROUP("Source Files\\PACS" FILES ${SOURCES_CREAIMAGEIO_PACS})
 	SOURCE_GROUP("Header Files\\PACS" FILES ${HEADER_CREAIMAGEIO_PACS})
@@ -181,7 +227,7 @@ ELSE(USE_WXWIDGETS)
 SET( GUI_SRCS
 	 ${QT_CPP}
 	 ${UI_SOURCES}
-	 ${MOC_SOURCES}
+	 ${QT_MOC_CPP}
 	 )
 ENDIF(USE_WXWIDGETS)
 SET( PRIMITIVE_SRCS
@@ -278,7 +324,7 @@ INSTALL(
 
      # Sets the settings for macro CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE
   SET(${LIBRARY_NAME}_INSTALL_FOLDER ${LIBRARY_NAME})
-  SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME})
+  SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME} )
   
 #  FILE(RELATIVE_PATH 
 #    ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS