78faffb6b8
Drop patch root-move-private-decl.patch (fixed upstream) Drop some previously backported patches Rename patch root-blas-linking-and-ignore-prefix.patch (partially fixed) Backport locking of gInterpreterMutex in TClingClassInfo::IsEnum
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
From 1aa9231becda09a89ec576e4a17ca4d9b6e2f310 Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
Date: Tue, 15 Mar 2022 14:55:37 +0100
|
|
Subject: [PATCH] Link to the blas library found by cmake, not hardcoded
|
|
"blas". Set ROOTIGNOREPREFIX=1 when running built binaries during build. Make
|
|
sure PCH is created before running emitters.
|
|
|
|
---
|
|
tmva/sofie/test/CMakeLists.txt | 14 ++++++++------
|
|
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/tmva/sofie/test/CMakeLists.txt b/tmva/sofie/test/CMakeLists.txt
|
|
index e4f9d28748..a3a2c9ae16 100644
|
|
--- a/tmva/sofie/test/CMakeLists.txt
|
|
+++ b/tmva/sofie/test/CMakeLists.txt
|
|
@@ -51,7 +51,7 @@ foreach(onnx_file ${ONNX_FILES})
|
|
get_filename_component(fname ${onnx_file} NAME_WE)
|
|
get_filename_component(fdir ${onnx_file} DIRECTORY)
|
|
add_custom_command(TARGET SofieCompileModels_ONNX POST_BUILD
|
|
- COMMAND ./emitFromONNX ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
|
|
+ COMMAND ${CMAKE_COMMAND} -E env ROOTIGNOREPREFIX=1 ./emitFromONNX ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
|
|
USES_TERMINAL
|
|
)
|
|
endforeach()
|
|
@@ -100,7 +101,7 @@ foreach(onnx_file ${ONNX_FILES})
|
|
get_filename_component(fname ${onnx_file} NAME_WE)
|
|
get_filename_component(fdir ${onnx_file} DIRECTORY)
|
|
add_custom_command(TARGET SofieCompileModels_ROOT POST_BUILD
|
|
- COMMAND ./emitFromROOT ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
|
|
+ COMMAND ${CMAKE_COMMAND} -E env ROOTIGNOREPREFIX=1 ./emitFromROOT ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
|
|
USES_TERMINAL
|
|
)
|
|
endforeach()
|
|
--
|
|
2.35.1
|
|
|