From acd1bc79764335995fb43659ae7cbb8915a82a6a Mon Sep 17 00:00:00 2001
From: Guilherme Amadio <amadio@cern.ch>
Date: Fri, 28 Sep 2018 11:19:09 +0200
Subject: [PATCH] Do not disable RDataFrame on Windows

---
 tree/CMakeLists.txt           | 10 ++++------
 tree/dataframe/CMakeLists.txt |  5 +++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt
index 53fba8fa45c..6b8997b8a55 100644
--- a/tree/CMakeLists.txt
+++ b/tree/CMakeLists.txt
@@ -1,6 +1,4 @@
-add_subdirectory(tree)        # special CMakeLists.txt
-add_subdirectory(treeplayer)  # special CMakeLists.txt
-add_subdirectory(treeviewer)  # special CMakeLists.txt
-if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) # this excludes RDF for 32 bits builds because of clang/gcc abi issues
-  add_subdirectory(dataframe)  # special CMakeLists.txt
-endif()
\ No newline at end of file
+add_subdirectory(tree)
+add_subdirectory(treeplayer)
+add_subdirectory(treeviewer)
+add_subdirectory(dataframe)
diff --git a/tree/dataframe/CMakeLists.txt b/tree/dataframe/CMakeLists.txt
index f7582aa2277..a29b1984a83 100644
--- a/tree/dataframe/CMakeLists.txt
+++ b/tree/dataframe/CMakeLists.txt
@@ -3,6 +3,11 @@
 # @author Danilo Piparo CERN, Pere Mato CERN
 ############################################################################
 
+# Disable RDataFrame on 32-bit UNIX platforms due to ROOT-9236
+if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+  return()
+endif()
+
 if(arrow)
   list(APPEND RDATAFRAME_EXTRA_HEADERS ROOT/RArrowDS.hxx)
 endif()
-- 
GitLab