Update to 6.40.04
The root-roofit-jsoninterface package was merged with root-roofit-hs3 Fix calculation of kerning distances in generated PDF files Dropped patches: 1 New patches: 2
This commit is contained in:
parent
3abc226a6f
commit
817304bc57
6 changed files with 244 additions and 117 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From 4b14d9d83ff154eca3672570f9be66513268209f Mon Sep 17 00:00:00 2001
|
||||
From ea7bed3a096949588b1b9086ddf66b2f7892a385 Mon Sep 17 00:00:00 2001
|
||||
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
||||
Date: Thu, 4 Dec 2025 23:13:28 +0100
|
||||
Subject: [PATCH] Dont export Python modules
|
||||
|
|
@ -9,18 +9,18 @@ Subject: [PATCH] Dont export Python modules
|
|||
2 files changed, 2 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
|
||||
index c21fb317f8c..7f1717e3f4b 100644
|
||||
index 95ca00bde9f..a12d3f05e4d 100644
|
||||
--- a/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
|
||||
+++ b/bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
|
||||
@@ -117,8 +117,7 @@ install(TARGETS CPyCppyy EXPORT ${CMAKE_PROJECT_NAME}Exports
|
||||
@@ -120,8 +120,7 @@ install(TARGETS CPyCppyy EXPORT ${CMAKE_PROJECT_NAME}Exports
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
|
||||
|
||||
-install(TARGETS cppyy EXPORT ${CMAKE_PROJECT_NAME}Exports
|
||||
- RUNTIME DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries # Windows
|
||||
+install(TARGETS cppyy RUNTIME DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries # Windows
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries)
|
||||
- RUNTIME DESTINATION ${CPPYY_INSTALL_DIR} COMPONENT libraries # Windows
|
||||
+install(TARGETS cppyy RUNTIME DESTINATION ${CPPYY_INSTALL_DIR} COMPONENT libraries # Windows
|
||||
LIBRARY DESTINATION ${CPPYY_INSTALL_DIR} COMPONENT libraries
|
||||
ARCHIVE DESTINATION ${CPPYY_INSTALL_DIR} COMPONENT libraries)
|
||||
|
||||
diff --git a/bindings/pyroot/pythonizations/CMakeLists.txt b/bindings/pyroot/pythonizations/CMakeLists.txt
|
||||
index 32d7d54b8da..5128e6d337c 100644
|
||||
|
|
@ -50,5 +50,5 @@ index 32d7d54b8da..5128e6d337c 100644
|
|||
ARCHIVE DESTINATION ${pymoduledir_install} COMPONENT libraries)
|
||||
|
||||
--
|
||||
2.54.0
|
||||
2.55.0
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue