From 76de31d7421066ee20dc776cad28e3d9494d5a89 Mon Sep 17 00:00:00 2001
From: Bertrand Bellenot <bertrand.bellenot@cern.ch>
Date: Tue, 3 Oct 2017 09:20:59 +0200
Subject: [PATCH] Remove imt and multiproc (unsupported) dependencies on
Windows
---
tree/treeplayer/CMakeLists.txt | 14 +++++++++++++-
tree/treeplayer/inc/ROOT/TDFInterface.hxx | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/tree/treeplayer/CMakeLists.txt b/tree/treeplayer/CMakeLists.txt
index 658783b5179..04b08bf8eda 100644
--- a/tree/treeplayer/CMakeLists.txt
+++ b/tree/treeplayer/CMakeLists.txt
@@ -11,6 +11,17 @@ list(REMOVE_ITEM dictHeaders ${CMAKE_SOURCE_DIR}/tree/treeplayer/inc/TBranchProx
ROOT_GLOB_SOURCES(sources src/*.cxx)
+if(MSVC)
+ list(REMOVE_ITEM dictHeaders ${CMAKE_SOURCE_DIR}/tree/treeplayer/inc/TMPWorkerTree.h)
+ list(REMOVE_ITEM dictHeaders ${CMAKE_CURRENT_SOURCE_DIR}/inc/ROOT/TTreeProcessorMT.h)
+ list(REMOVE_ITEM dictHeaders ${CMAKE_CURRENT_SOURCE_DIR}/inc/ROOT/TProcessExecutor.hxx)
+ list(REMOVE_ITEM dictHeaders ${CMAKE_CURRENT_SOURCE_DIR}/inc/ROOT/TTreeProcessorMP.hxx)
+ list(REMOVE_ITEM sources ${CMAKE_SOURCE_DIR}/tree/treeplayer/src/TMPWorkerTree.cxx)
+ list(REMOVE_ITEM sources ${CMAKE_SOURCE_DIR}/tree/treeplayer/src/TTreeProcessorMP.cxx)
+else()
+ set(TREEPLAYER_DEPENDENCIES MultiProc Imt)
+endif()
+
if(NOT imt)
list(REMOVE_ITEM dictHeaders ${CMAKE_CURRENT_SOURCE_DIR}/inc/ROOT/TTreeProcessorMT.h)
list(REMOVE_ITEM sources ${CMAKE_CURRENT_SOURCE_DIR}/src/TTreeProcessorMT.cxx)
@@ -23,7 +34,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(TreePlayer
SOURCES ${sources}
DICTIONARY_OPTIONS "-writeEmptyRootPCM"
LIBRARIES ${TBB_LIBRARIES}
- DEPENDENCIES Tree Graf3d Graf Hist Gpad RIO MathCore MultiProc Imt)
+ DEPENDENCIES Tree Graf3d Graf Hist Gpad RIO MathCore
+ ${TREEPLAYER_DEPENDENCIES})
#---Extra rules-------------------------------------------------------
if(APPLE)
diff --git a/tree/treeplayer/inc/ROOT/TDFInterface.hxx b/tree/treeplayer/inc/ROOT/TDFInterface.hxx
index 2aeca81bc0a..ed69e804599 100644
--- a/tree/treeplayer/inc/ROOT/TDFInterface.hxx
+++ b/tree/treeplayer/inc/ROOT/TDFInterface.hxx
@@ -294,7 +294,7 @@ class TInterface {
using TRangeBase = TDFDetail::TRangeBase;
using TCustomColumnBase = TDFDetail::TCustomColumnBase;
using TLoopManager = TDFDetail::TLoopManager;
- friend std::string cling::printValue(ROOT::Experimental::TDataFrame *tdf); // For a nice printing at the prompt
+ friend std::string cling::printValue(TDataFrame *tdf); // For a nice printing at the prompt
template <typename T>
friend class TInterface;
--
GitLab