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
30 lines
2.1 KiB
Diff
30 lines
2.1 KiB
Diff
diff -ur root-6.22.02.orig/bindings/jupyroot/CMakeLists.txt root-6.22.02/bindings/jupyroot/CMakeLists.txt
|
|
--- root-6.22.02.orig/bindings/jupyroot/CMakeLists.txt 2020-08-17 14:41:56.000000000 +0200
|
|
+++ root-6.22.02/bindings/jupyroot/CMakeLists.txt 2020-08-19 09:49:12.094722642 +0200
|
|
@@ -70,8 +70,7 @@
|
|
endforeach()
|
|
|
|
# Install library
|
|
- install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
|
|
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
|
|
+ install(TARGETS ${libname} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
|
|
|
|
diff -ur root-6.22.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt root-6.22.02/bindings/pyroot/pythonizations/CMakeLists.txt
|
|
--- root-6.22.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt 2020-08-17 14:41:56.000000000 +0200
|
|
+++ root-6.22.02/bindings/pyroot/pythonizations/CMakeLists.txt 2020-08-19 10:36:10.390486171 +0200
|
|
@@ -133,11 +133,10 @@
|
|
# Create meta-target PyROOT2 and PyROOT3 (INTERFACE library)
|
|
# Export of targets are not supported for custom targets(add_custom_targets())
|
|
add_library(PyROOT${python_major_version_string} INTERFACE)
|
|
- target_link_libraries(PyROOT${python_major_version_string} INTERFACE cppyy_backend${python_under_version_string} cppyy${python_under_version_string} ROOTPythonizations${python_under_version_string})
|
|
+ target_link_libraries(PyROOT${python_major_version_string} INTERFACE cppyy_backend${python_under_version_string} cppyy${python_under_version_string})
|
|
|
|
# Install library
|
|
- install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
|
|
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
|
|
+ install(TARGETS ${libname} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
|
|
|