Merge topic 'fix-r-compilation'

2166c06 FiltersStatisticsGnuR: fix R_NO_REMAP juggling Acked-by: Kitware Robot <[email protected]> Reviewed-by: Brad King <[email protected]> Merge-request: !437
t-bltg · Jul 20, 2015 · 51c4966 · 51c4966
2 parents f8d2a87 + 2166c06
commit 51c4966
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/Filters/StatisticsGnuR/CMakeLists.txt b/Filters/StatisticsGnuR/CMakeLists.txt
@@ -14,6 +14,8 @@ set(Module_SRCS
 find_package(R)
 include_directories(${R_INCLUDE_DIR})
 
+add_definitions(-DVTK_BUILDING_FILTERS_STATISTICSGNUR)
+
 # Configure the module specific settings into a module configured header.
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vtkFiltersStatisticsGnuRConfigure.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/vtkFiltersStatisticsGnuRConfigure.h)

diff --git a/Filters/StatisticsGnuR/vtkRAdapter.cxx b/Filters/StatisticsGnuR/vtkRAdapter.cxx
@@ -48,6 +48,8 @@
 #include <stdio.h>
 #include <cassert>
 
+#define R_NO_REMAP /* AVOID SOME SERIOUS STUPIDITY. DO NOT REMOVE. */
+
 #include "R.h"
 #include "Rdefines.h"
 #include "R_ext/Parse.h"

diff --git a/Filters/StatisticsGnuR/vtkRAdapter.h b/Filters/StatisticsGnuR/vtkRAdapter.h
@@ -49,7 +49,9 @@
 #include "vtkFiltersStatisticsGnuRModule.h" // For export macro
 #include "vtkObject.h"
 
+#ifndef VTK_BUILDING_FILTERS_STATISTICSGNUR
 #define R_NO_REMAP /* Don't pollute the namespace (some of which conflict). DO NOT REMOVE. */
+#endif
 
 #include "Rinternals.h" // Needed for Rinternals.h SEXP data structure