From af151dcabd57a5614eec0f24d408c04faee21cd7 Mon Sep 17 00:00:00 2001
From: Oksana Shadura <oksana.shadura@cern.ch>
Date: Thu, 30 Aug 2018 13:37:30 +0200
Subject: [PATCH] Revert "Updates for generation of correct relative path for
core headers"
This reverts commit e56b4a969833a1b9ce8f7bb5a359b19a5e22c4ce.
---
cmake/modules/RootNewMacros.cmake | 2 --
1 file changed, 2 deletions(-)
diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake
index 6c71ef6833d..e675215422e 100644
--- a/cmake/modules/RootNewMacros.cmake
+++ b/cmake/modules/RootNewMacros.cmake
@@ -272,7 +272,6 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
rootcling_stage1 textinput thread unix winnt zip)
foreach(core_folder ${core_folders})
string(REPLACE "${CMAKE_SOURCE_DIR}/core/${core_folder}/inc/" "" headerfiles "${headerfiles}")
- string(REPLACE "${CMAKE_BINARY_DIR}/include/" "" headerfiles "${headerfiles}")
endforeach()
endif()
@@ -282,7 +281,6 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
if(PROJECT_NAME STREQUAL ROOT)
foreach(hf ${headerfiles})
string(REPLACE "${PROJECT_SOURCE_DIR}" "" hfrel "${hf}")
- string(REPLACE "${CMAKE_BINARY_DIR}/include/" "" hfrel "${hf}")
# Test folders don't follow this pattern and need absolute paths,
# so we don't run our sanity check on them.
if(NOT "${hfrel}" MATCHES "/test/")
--
GitLab