From: Eduardo DAVILA <davila@dhcp-15.b401.creatis.insa-lyon.fr>
Date: Fri, 24 Sep 2021 13:53:11 +0000 (+0200)
Subject: #3471 Doxygen OFF in CMake AND wx.h conflict
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5e5433cf3c6160a21432844163d2d242f46d77f4;p=creaMaracasVisu.git

#3471 Doxygen OFF in CMake AND wx.h conflict
---

diff --git a/lib/doxygen/CMakeLists.txt b/lib/doxygen/CMakeLists.txt
index bc99473..98d9fa9 100644
--- a/lib/doxygen/CMakeLists.txt
+++ b/lib/doxygen/CMakeLists.txt
@@ -28,7 +28,7 @@
 MACRO(CREA_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
 
   #--------------------------------------------------------------------------
-  SET(USE_DOXYGEN ON CACHE BOOL "" FORCE)
+  SET(USE_DOXYGEN OFF CACHE BOOL "" FORCE)
   
   # Name
   SET(DOXYGEN_PROJECT_NAME "${NAME}")
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h
index cc29f75..7dea59b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h
@@ -26,9 +26,18 @@
 #ifndef wxMaracasRenderImageManagementPanel_H_
 #define wxMaracasRenderImageManagementPanel_H_
 
-#include "wxMaracasRenderImageTransformation.h"
 
+
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+
+#ifndef WX_PRECOMP
 #include <wx/wx.h>
+#endif
+
+#include "wxMaracasRenderImageTransformation.h"
+
 #include "creaMaracasVisu_EXPORT.h"
 
 class creaMaracasVisu_EXPORT wxMaracasRenderImageManagementPanel : public wxDialog
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
index ad37e6c..a59cd60 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
@@ -23,6 +23,12 @@
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
 #include "wxMaracasRenderImageTransformation.h"
 #include "wxMaracasRendererView.h"
 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
index 1098be2..ce9dfaa 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
@@ -31,6 +31,10 @@
 
 =========================================================================*/
 
+#include <wx/config.h>
+#include <creaWx.h>
+#include <wx/tooltip.h>
+
 #include "wxMaracasRendererView.h"
 
 #include <wx/colordlg.h>
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
index 818dd32..3b33ab4 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
@@ -34,9 +34,13 @@
 #ifndef __wxMaracasRendererViewPanelH__
 #define __wxMaracasRendererViewPanelH__
 
-#include <vector>
+#ifndef WX_PRECOMP
 #include <wx/wx.h>
+#endif
+
 #include "wx/aui/aui.h"
+
+#include <vector>
 #include <iostream>
 #include "marTypes.h"
 #include "vtkProp3D.h"
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxPanelCuttingImageData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxPanelCuttingImageData.cxx
index d16cff9..7d39bdd 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxPanelCuttingImageData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxPanelCuttingImageData.cxx
@@ -23,6 +23,12 @@
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
 
 #include "wxPanelCuttingImageData.h"
 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx
index b1e26a1..a5c481c 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx
@@ -23,6 +23,12 @@
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
 #include "wxVTKRenderWindowInteractorEditContour.h"
 
 //---------------------------------------------------------------------------
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
index 3c46e68..c6a98b0 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
@@ -26,7 +26,6 @@
 #ifndef _wxVTKRenderWindowInteractorEditContour_h_
 #define _wxVTKRenderWindowInteractorEditContour_h_
 
-
 #include <creawxVTKRenderWindowInteractor.h>
 
 #include <vtkCommand.h> 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
index b41609e..a9a493a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
@@ -23,6 +23,13 @@
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
+
 #include "wxVtkClipping3DView.h"
 
 #include "wxVtkClipping3DViewCntrlPanel.h"
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
index 3657b37..4401691 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
@@ -24,6 +24,13 @@
 # ------------------------------------------------------------------------ */
 
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
+
 #include "wxVtkClipping3DViewCntrlPanel.h"
 #include "wx/colordlg.h"
 #include "vtkTriangleFilter.h"
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
index 72fa34e..e6636ba 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
@@ -27,6 +27,12 @@
 //RaC 03-2010 Divides in two panels thje last tab Surface/Volume
 //-------------------------------------------------------------------
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
 #include "wxVtkClipping3DViewVolCntrlPanel.h"
 #include "wx/colordlg.h"
 #include "vtkTriangleFilter.h"