X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FCMakeLists.txt;h=485d7ecfb4b226cb202749ec131b60e36e24b265;hb=c2623301480298241bf628442428f86b9800bd42;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..485d7ec 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt
+++ b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt
@@ -7,7 +7,6 @@
 INCLUDE_DIRECTORIES(
 "C:/Creatis/MaracasTools/OSGi/src"
 "C:/Creatis/MaracasTools/Include"
-"/home/jpr/Creatis/Maracas/src/interface/wxWindows"
 )
 
 #-----------------------------------------------------------------------------
@@ -54,6 +53,11 @@ SET(MARACAS_LIB_SRCS
   wxMaracasHelpDialog.h
   wxMaracasQuantification.cxx
   wxMaracasQuantification.h
+  wxMaracasSurfaceRendering.cxx
+  wxMaracasSurfaceRendering.h
+  wxMaracasRendererView.cxx
+  wxMaracasRendererView.h
+  
   
   	
   widgets/wxVTKRenderWindowInteractor.cxx
@@ -331,7 +335,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 +381,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 +408,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 +478,8 @@ ELSE(WIN32)
 
 
 ENDIF(WIN32)
-SUBDIRS(widgets)
+ADD_SUBDIRECTORY(widgets)
+
+