From a03533c2939b83042b3ac22db121734764f7e3c2 Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <vvasilev@cern.ch>
Date: Mon, 19 Dec 2016 12:48:08 +0100
Subject: [PATCH] Do not add *.icc files in the modulemap.
---
math/mathcore/Module.mk | 3 ++-
math/smatrix/Module.mk | 7 ++++---
tmva/tmva/Module.mk | 3 ++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/math/mathcore/Module.mk b/math/mathcore/Module.mk
index a3cd58a0f46..936245209fe 100644
--- a/math/mathcore/Module.mk
+++ b/math/mathcore/Module.mk
@@ -93,7 +93,8 @@ ALLHDRS += $(MATHCOREMH_REL)
ALLLIBS += $(MATHCORELIB)
ALLMAPS += $(MATHCOREMAP)
ifeq ($(CXXMODULES),yes)
- CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MATHCOREMH_REL))
+ MATHCOREMH_NOICC_REL := $(filter-out $(patsubst $(MODDIRI)/%,include/%,$(MATHCOREMH3)), $(MATHCOREMH_REL))
+ CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MATHCOREMH_NOICC_REL))
CXXMODULES_MODULEMAP_CONTENTS += module Math_Core { \\n
CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS)
CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n"
diff --git a/math/smatrix/Module.mk b/math/smatrix/Module.mk
index fd2e3442087..32747020cd0 100644
--- a/math/smatrix/Module.mk
+++ b/math/smatrix/Module.mk
@@ -45,12 +45,13 @@ SMATRIXMAP := $(SMATRIXLIB:.$(SOEXT)=.rootmap)
SMATRIXMAP32:= $(SMATRIXLIB:.$(SOEXT)=32.rootmap)
# used in the main Makefile
-SMATRIXH_REL := $(patsubst $(MODDIRI)/Math/%,include/Math/%,$(SMATRIXH))
-ALLHDRS += $(SMATRIXH_REL)
+SMATRIXH1_REL := $(patsubst $(MODDIRI)/Math/%,include/Math/%,$(SMATRIXH1))
+SMATRIXH2_REL := $(patsubst $(MODDIRI)/Math/%,include/Math/%,$(SMATRIXH2))
+ALLHDRS += $(SMATRIXH1_REL) $(SMATRIXH2_REL)
ALLLIBS += $(SMATRIXLIB)
ALLMAPS += $(SMATRIXMAP) $(SMATRIXMAP32)
ifeq ($(CXXMODULES),yes)
- CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SMATRIXH_REL))
+ CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SMATRIXH1_REL))
CXXMODULES_MODULEMAP_CONTENTS += module Math_$(MODNAME) { \\n
CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS)
CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n"
diff --git a/tmva/tmva/Module.mk b/tmva/tmva/Module.mk
index 878f29484a1..89b90f1ae36 100644
--- a/tmva/tmva/Module.mk
+++ b/tmva/tmva/Module.mk
@@ -74,7 +74,8 @@ ALLHDRS += $(TMVA_REL)
ALLLIBS += $(TMVALIB)
ALLMAPS += $(TMVAMAP)
ifeq ($(CXXMODULES),yes)
- CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(TMVA_REL))
+ TMVA_NOICC_REL := $(filter-out include/TMVA/NeuralNet.icc, $(TMVA_REL))
+ CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(TMVA_NOICC_REL))
CXXMODULES_MODULEMAP_CONTENTS += module Tmva_$(MODNAME) { \\n
CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS)
CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n"
--
GitLab