From 692577295c46555a169a208116adf987458dd750 Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Thu, 24 Nov 2016 10:41:55 +0100
Subject: [PATCH] Adapt build system files to new header location.
---
core/clib/CMakeLists.txt | 2 ++
core/clib/Module.mk | 3 +++
core/newdelete/CMakeLists.txt | 2 ++
core/newdelete/Module.mk | 3 +++
core/unix/CMakeLists.txt | 3 ++-
core/unix/Module.mk | 3 +++
io/io/CMakeLists.txt | 2 ++
io/io/Module.mk | 1 +
proof/proofd/CMakeLists.txt | 1 +
9 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/core/clib/CMakeLists.txt b/core/clib/CMakeLists.txt
index bd988de2587..2d12d51072d 100644
--- a/core/clib/CMakeLists.txt
+++ b/core/clib/CMakeLists.txt
@@ -5,6 +5,8 @@
set(Clib_dict_headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/strlcpy.h
${CMAKE_CURRENT_SOURCE_DIR}/inc/snprintf.h PARENT_SCOPE)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/res)
+
ROOT_OBJECT_LIBRARY(Clib *.c)
ROOT_INSTALL_HEADERS()
diff --git a/core/clib/Module.mk b/core/clib/Module.mk
index 9fd6ed2d2a7..4034d29aef1 100644
--- a/core/clib/Module.mk
+++ b/core/clib/Module.mk
@@ -11,6 +11,7 @@ MODDIRI := $(MODDIR)/inc
CLIBDIR := $(MODDIR)
CLIBDIRS := $(CLIBDIR)/src
CLIBDIRI := $(CLIBDIR)/inc
+CLIBDIRR := $(CLIBDIR)/res
##### libClib (part of libCore) #####
CLIBL := $(MODDIRI)/LinkDef.h
@@ -51,3 +52,5 @@ distclean-$(MODNAME): clean-$(MODNAME)
distclean:: distclean-$(MODNAME)
##### extra rules ######
+$(CLIBO): CXXFLAGS += -I$(CLIBDIRR)
+$(CLIBO): CFLAGS += -I$(CLIBDIRR)
diff --git a/core/newdelete/CMakeLists.txt b/core/newdelete/CMakeLists.txt
index 04fb54e0703..90ce169a1a6 100644
--- a/core/newdelete/CMakeLists.txt
+++ b/core/newdelete/CMakeLists.txt
@@ -2,6 +2,8 @@
# CMakeLists.txt file for building ROOT core/newdelete package
############################################################################
+include_directories(${CMAKE_SOURCE_DIR}/core/clib/res)
+
ROOT_LINKER_LIBRARY(New *.cxx DEPENDENCIES Core)
ROOT_INSTALL_HEADERS()
diff --git a/core/newdelete/Module.mk b/core/newdelete/Module.mk
index 46c0ac91218..faf53b4a2f3 100644
--- a/core/newdelete/Module.mk
+++ b/core/newdelete/Module.mk
@@ -49,3 +49,6 @@ distclean-$(MODNAME): clean-$(MODNAME)
@rm -f $(NEWDEP) $(NEWLIB)
distclean:: distclean-$(MODNAME)
+
+##### extra rules ######
+$(NEWO): CXXFLAGS += -I$(ROOT_SRCDIR)/core/clib/res
diff --git a/core/unix/CMakeLists.txt b/core/unix/CMakeLists.txt
index dc4768b1b00..294b106f2fb 100644
--- a/core/unix/CMakeLists.txt
+++ b/core/unix/CMakeLists.txt
@@ -6,7 +6,8 @@ ROOT_GLOB_SOURCES(sources ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
set(Unix_dict_headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/TUnixSystem.h PARENT_SCOPE)
-include_directories(${CMAKE_SOURCE_DIR}/net/net/inc)
+include_directories(${CMAKE_SOURCE_DIR}/net/net/inc
+ ${CMAKE_SOURCE_DIR}/core/clib/res)
ROOT_OBJECT_LIBRARY(Unix ${sources})
ROOT_INSTALL_HEADERS()
diff --git a/core/unix/Module.mk b/core/unix/Module.mk
index 4ef929dba3c..34be1f09df1 100644
--- a/core/unix/Module.mk
+++ b/core/unix/Module.mk
@@ -44,3 +44,6 @@ distclean-$(MODNAME): clean-$(MODNAME)
@rm -f $(UNIXDEP)
distclean:: distclean-$(MODNAME)
+
+##### extra rules ######
+$(UNIXO): CXXFLAGS += -I$(ROOT_SRCDIR)/core/clib/res
diff --git a/io/io/CMakeLists.txt b/io/io/CMakeLists.txt
index f32ecbaf35d..b4eb805b742 100644
--- a/io/io/CMakeLists.txt
+++ b/io/io/CMakeLists.txt
@@ -4,6 +4,8 @@
set(libname RIO)
+include_directories(${CMAKE_SOURCE_DIR}/core/clib/res)
+
ROOT_GENERATE_DICTIONARY(G__IO *.h STAGE1 MODULE ${libname} LINKDEF LinkDef.h)
if(root7)
diff --git a/io/io/Module.mk b/io/io/Module.mk
index 672e3b49dd9..5f4fce6ee8d 100644
--- a/io/io/Module.mk
+++ b/io/io/Module.mk
@@ -72,3 +72,4 @@ distclean-$(MODNAME): clean-$(MODNAME)
distclean:: distclean-$(MODNAME)
##### extra rules ######
+$(IOO): CXXFLAGS += -I$(ROOT_SRCDIR)/core/clib/res
diff --git a/proof/proofd/CMakeLists.txt b/proof/proofd/CMakeLists.txt
index ec7c159f33b..8e6b92b5e0a 100644
--- a/proof/proofd/CMakeLists.txt
+++ b/proof/proofd/CMakeLists.txt
@@ -5,6 +5,7 @@
include_directories(${XROOTD_INCLUDE_DIRS})
include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../rpdutils/res)
add_definitions(${XROOTD_CFLAGS})
#
# This should not be needed any longer after fix 039136791216af4620b9041e89d60c3ac0bab2f7
--
GitLab