Adapt build system files to new header location.

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()

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)

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()
 

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

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()

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

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)

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

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