X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FCMakeLists.txt;h=23449a77213fb9e47189a527576fc322a68bcd2e;hb=b2ac7f59e78e33f8e11065cffa2f2072aa9a9ee5;hp=d5056c983db707bdbbb16da3f5a905ab8ebd1eca;hpb=e6b030ceb3ee4eea1f012e7d5c47503cf6322c61;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt
index d5056c9..23449a7 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt
+++ b/lib/maracasVisuLib/src/interface/wxWindows/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.
+# ------------------------------------------------------------------------ */
+
 # This directory should only be build if wxWindows and VTK can be found
 
 
@@ -7,7 +32,6 @@
 INCLUDE_DIRECTORIES(
 "C:/Creatis/MaracasTools/OSGi/src"
 "C:/Creatis/MaracasTools/Include"
-"/home/jpr/Creatis/Maracas/src/interface/wxWindows"
 )
 
 #-----------------------------------------------------------------------------
@@ -54,6 +78,11 @@ SET(MARACAS_LIB_SRCS
   wxMaracasHelpDialog.h
   wxMaracasQuantification.cxx
   wxMaracasQuantification.h
+  wxMaracasSurfaceRendering.cxx
+  wxMaracasSurfaceRendering.h
+  wxMaracasRendererView.cxx
+  wxMaracasRendererView.h
+  
   
   	
   widgets/wxVTKRenderWindowInteractor.cxx
@@ -331,7 +360,9 @@ IF(WIN32)
       CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll    	${LIBRARY_OUTPUT_PATH}/debug/wxmsw28d_qa_vc_custom.dll		COPYONLY        )
       CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll  ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28d_richtext_vc_custom.dll	COPYONLY        )
       CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll    	${LIBRARY_OUTPUT_PATH}/debug/wxmsw28d_xrc_vc_custom.dll		COPYONLY        )
-      CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll                 ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28_aui_vc_custom.dll		        COPYONLY        ) 
+      CONFIGURE_FILE(
+${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll
+${LIBRARY_OUTPUT_PATH}/debug/wxmsw28_aui_vc_custom.dll          COPYONLY        ) 
     ELSE ( EXISTS ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll )
 	MESSAGE (FATAL_ERROR, " wxWidgets dlls not found (Debug copy dlls)")
     ENDIF( EXISTS ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll )
@@ -375,7 +406,7 @@ IF(WIN32)
 
 
 
-##----Copy Release cofiguration and DLLs---
+##----Copy Release configuration and DLLs---
 
     FILE(MAKE_DIRECTORY ${LIBRARY_OUTPUT_PATH}/Release )
     FILE(MAKE_DIRECTORY ${LIBRARY_OUTPUT_PATH}/Release/MySql/data )
@@ -402,7 +433,7 @@ IF(WIN32)
       CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_richtext_vc_custom.dll   ${LIBRARY_OUTPUT_PATH}/release/wxmsw28_richtext_vc_custom.dll	COPYONLY        )
       CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_qa_vc_custom.dll    	${LIBRARY_OUTPUT_PATH}/release/wxmsw28_qa_vc_custom.dll		COPYONLY        )
       CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_xrc_vc_custom.dll    	${LIBRARY_OUTPUT_PATH}/release/wxmsw28_xrc_vc_custom.dll	COPYONLY        )
-      CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll                ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28_aui_vc_custom.dll		        COPYONLY        ) 
+      CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll        ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28_aui_vc_custom.dll		COPYONLY        ) 
     ELSE ( EXISTS ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28_net_vc_custom.dll )
 	MESSAGE (FATAL_ERROR, " wxWidgets dlls not found (Release copy dlls)")
     ENDIF( EXISTS ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28_net_vc_custom.dll )
@@ -472,6 +503,8 @@ ELSE(WIN32)
 
 
 ENDIF(WIN32)
-SUBDIRS(widgets)
+ADD_SUBDIRECTORY(widgets)
+
+