Commit f8c3546d authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'pull-distro-patches'

36b7d409 mpi4py: strip trailing whitespace from the include dir
f3450ca9 vtkRAdapter: move R_NO_REMAP to the header
1cf2f9be

 doxygen: generate SVG images
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: default avatarDavid E DeMarle <dave.demarle@kitware.com>
Merge-request: !376
parents e8933ac1 36b7d409
...@@ -48,8 +48,6 @@ ...@@ -48,8 +48,6 @@
#include <stdio.h> #include <stdio.h>
#include <cassert> #include <cassert>
#define R_NO_REMAP /* AVOID SOME SERIOUS STUPIDITY. DO NOT REMOVE. */
#include "R.h" #include "R.h"
#include "Rdefines.h" #include "Rdefines.h"
#include "R_ext/Parse.h" #include "R_ext/Parse.h"
......
...@@ -48,6 +48,9 @@ ...@@ -48,6 +48,9 @@
#include "vtkFiltersStatisticsGnuRModule.h" // For export macro #include "vtkFiltersStatisticsGnuRModule.h" // For export macro
#include "vtkObject.h" #include "vtkObject.h"
#define R_NO_REMAP /* Don't pollute the namespace (some of which conflict). DO NOT REMOVE. */
#include "Rinternals.h" // Needed for Rinternals.h SEXP data structure #include "Rinternals.h" // Needed for Rinternals.h SEXP data structure
class vtkInformation; class vtkInformation;
...@@ -125,6 +128,3 @@ private: ...@@ -125,6 +128,3 @@ private:
#endif #endif
...@@ -11,6 +11,7 @@ if(VTK_USE_SYSTEM_MPI4PY) ...@@ -11,6 +11,7 @@ if(VTK_USE_SYSTEM_MPI4PY)
COMMAND "${PYTHON_EXECUTABLE}" -c COMMAND "${PYTHON_EXECUTABLE}" -c
"import mpi4py; print(mpi4py.get_include())" "import mpi4py; print(mpi4py.get_include())"
OUTPUT_VARIABLE mpi4py_include_dir OUTPUT_VARIABLE mpi4py_include_dir
OUTPUT_STRIP_TRAILING_WHITESPACE
) )
set(MPI4PY_INCLUDE_DIR "${mpi4py_include_dir}" set(MPI4PY_INCLUDE_DIR "${mpi4py_include_dir}"
CACHE PATH "Path the the MPI4Py include directory") CACHE PATH "Path the the MPI4Py include directory")
......
...@@ -22,6 +22,7 @@ PDF_HYPERLINKS = YES ...@@ -22,6 +22,7 @@ PDF_HYPERLINKS = YES
HAVE_DOT = @HAVE_DOT_YESNO@ HAVE_DOT = @HAVE_DOT_YESNO@
DOT_PATH = "@DOT_PATH@" DOT_PATH = "@DOT_PATH@"
DOT_IMAGE_FORMAT = svg
CLASS_GRAPH = YES CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES COLLABORATION_GRAPH = YES
TEMPLATE_RELATIONS = YES TEMPLATE_RELATIONS = YES
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment