1361b0d800
Drop patch previously backported: root-doxygen-endof-part1.patch Drop patch accepted upstream: root-python2-compat.patch Add back line accidentally removed in root-config Install headers in new PyROOT with COMPONENT headers Increase test timeout for ppc64le
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From c6b03126690439f5137e4a1090e81e93fd09df9a Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
Date: Wed, 19 Aug 2020 20:17:37 +0200
|
|
Subject: [PATCH] Install headers with COMPONENT headers
|
|
|
|
---
|
|
bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt | 4 +++-
|
|
bindings/pyroot/pythonizations/CMakeLists.txt | 4 +++-
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
|
|
index 00ce6c13b8..e23b439b3e 100644
|
|
--- a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
|
|
+++ b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
|
|
@@ -120,4 +120,6 @@ foreach(val RANGE ${how_many_pythons})
|
|
endforeach()
|
|
|
|
file(COPY ${headers} DESTINATION ${CMAKE_BINARY_DIR}/include/CPyCppyy)
|
|
-install(FILES ${headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CPyCppyy)
|
|
+install(FILES ${headers}
|
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CPyCppyy
|
|
+ COMPONENT headers)
|
|
diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
|
|
index 7827204396..377ec46916 100644
|
|
--- a/bindings/pyroot/pythonizations/CMakeLists.txt
|
|
+++ b/bindings/pyroot/pythonizations/CMakeLists.txt
|
|
@@ -159,6 +159,8 @@ install(DIRECTORY ${localruntimedir}/ROOT
|
|
COMPONENT libraries)
|
|
|
|
# Install headers required by pythonizations
|
|
-install(FILES ${PYROOT_EXTRA_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ROOT)
|
|
+install(FILES ${PYROOT_EXTRA_HEADERS}
|
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ROOT
|
|
+ COMPONENT headers)
|
|
|
|
ROOT_ADD_TEST_SUBDIRECTORY(test)
|
|
--
|
|
2.26.2
|
|
|