Skip to content

Commit 7134977

Browse files
committed
[cppyy-backend] Sync with compres forks, pass header location to clingwrapper
1 parent 62bd0e7 commit 7134977

4 files changed

Lines changed: 42 additions & 606 deletions

File tree

bindings/pyroot/cppyy/cppyy-backend/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@ target_include_directories(cppyy_backend PRIVATE
1212
${CMAKE_SOURCE_DIR}/interpreter/CppInterOp/include
1313
)
1414

15+
target_compile_definitions(cppyy_backend PRIVATE
16+
# FIXME: These headers need to be installed and the location must be provided to clingwrapper in a robust way
17+
CPPINTEROP_DIR="${CMAKE_SOURCE_DIR}/interpreter/CppInterOp"
18+
CMAKE_SHARED_LIBRARY_SUFFIX="${CMAKE_SHARED_LIBRARY_SUFFIX}"
19+
# The CppInterOp JitCall debug assertions (AreArgumentsValid,
20+
# ReportInvokeStart) use Clang AST internals and cannot be resolved
21+
# through the dispatch mechanism. Disable them in this translation unit.
22+
NDEBUG
23+
)
24+
25+
1526
target_link_libraries(cppyy_backend Core)
1627
if(NOT MSVC)
1728
target_compile_options(cppyy_backend PRIVATE -fPIC)

bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/callcontext.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
// Standard
55
#include <vector>
66

7-
//Bindings
8-
#include "cpp_cppyy.h"
9-
107
//ROOT
118
// #include "Rtypes.h"
129

0 commit comments

Comments
 (0)