X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=fe7909c9be782b8c27157cc3140f8bd140843fbc;hb=4518d93a0a51221812cfb6d783f8e7f4fd77b498;hp=14db1349d5bd72f0e155d3ad953f0b7e125b899a;hpb=c7fb64ba9ad7a8a3ce5a7a1b70b590d994bd130d;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 14db134..fe7909c 100644
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/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.
+# ------------------------------------------------------------------------ */
+
 #----------------------------------------------------------------------------
 # USER ! SET THE NAME OF YOUR LIBRARY
 SET ( LIBRARY_NAME   creaMaracasVisu  )
@@ -38,6 +63,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #FILE(GLOB ${LIBRARY_NAME}_HEADERS "*.h")
   # OR MANUALLY LIST YOUR HEADERS WITH NEXT COMMAND
 
+
   FILE(GLOB ${LIBRARY_NAME}_HEADERS_WXWIN "src/interface/wxWindows/*.h")
   FILE(GLOB ${LIBRARY_NAME}_SOURCES_WXWIN src/interface/wxWindows/*.cxx src/interface/wxWindows/*.cpp src/interface/wxWindows/*.cc)
 
@@ -73,9 +99,10 @@ IF ( BUILD_${LIBRARY_NAME} )
   FILE(GLOB ${LIBRARY_NAME}_HEADERS_KERNEL "src/kernel/*.h")
   FILE(GLOB ${LIBRARY_NAME}_SOURCES_KERNEL src/kernel/*.cxx src/kernel/*.cpp src/kernel/*.cc)
 
-FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutModule/kernel/*.h)
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutModule/kernel/*.h)
   FILE(GLOB ${LIBRARY_NAME}_SOURCES_CUTMODULE src/CutModule/interface/*.cxx src/CutModule/kernel/*.cxx)
 
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_MARACASVISULIB_INCLUDE include/*.h )
 
   SET ( ${LIBRARY_NAME}_HEADERS
   	${${LIBRARY_NAME}_HEADERS_WXWIN}
@@ -85,13 +112,12 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutM
     	${${LIBRARY_NAME}_HEADERS_PPLOTTER}
     	${${LIBRARY_NAME}_HEADERS_MANUAL_CONTOUR}
     	${${LIBRARY_NAME}_HEADERS_MANUAL_PAINT}
-    	include/matrix.h
+    	${${LIBRARY_NAME}_HEADERS_MARACASVISULIB_INCLUDE}
 	${${LIBRARY_NAME}_HEADERS_KERNEL}
 	${${LIBRARY_NAME}_HEADERS_CUTMODULE}
 	${${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER}
 	${${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER}
 	${${LIBRARY_NAME}_HEADERS_UNDO_REDO}
-	
   )
   #----------------------------------------------------------------------------
 
@@ -136,12 +162,19 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutM
 	#${BOOST_LIBRARIES}
 	#jhcl-End===========================================================================
 		#creaMaracasVisu_CutModule_interface
-#EED CM
-   	     KernelVolumeRenderer
-             KernelViewerWidgets
-             KernelSurfaceRenderer
+
+
              BaseVolumeRenderer
              BaseSurfaceRenderer
+             KernelVolumeRenderer
+             KernelViewerWidgets
+             KernelSurfaceRenderer
+
+#EED CM
+   	     #KernelVolumeRenderer
+#EED             KernelViewerWidgets
+             #KernelSurfaceRenderer
+             #BaseSurfaceRenderer
 
     )
   #----------------------------------------------------------------------------
@@ -174,12 +207,13 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutM
  # 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 
+             BaseVolumeRenderer
+             BaseSurfaceRenderer
              KernelVolumeRenderer
              KernelViewerWidgets
              KernelSurfaceRenderer
-             BaseVolumeRenderer
-             BaseSurfaceRenderer
+             ${LIBRARY_NAME}
        )
 
 #  SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME}