diff options
| author | Carlos Aznarán Laos | 2023-05-19 11:11:15 -0500 |
|---|---|---|
| committer | Carlos Aznarán Laos | 2023-05-19 11:11:15 -0500 |
| commit | c5ee85b10c359d7cecd0e35da5cc7ee4acafb32b (patch) | |
| tree | eadc9d4531d215bdb749a2389d2f9fd428c482b1 /0002-Use-llvm-from-cling.patch | |
| parent | 1b85abbeab4fe5ec69aeb75c7ecb19511f28a26f (diff) | |
| download | aur-c5ee85b10c359d7cecd0e35da5cc7ee4acafb32b.tar.gz | |
Update patch
Diffstat (limited to '0002-Use-llvm-from-cling.patch')
| -rw-r--r-- | 0002-Use-llvm-from-cling.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/0002-Use-llvm-from-cling.patch b/0002-Use-llvm-from-cling.patch index d23a03be7294..7a2d45985063 100644 --- a/0002-Use-llvm-from-cling.patch +++ b/0002-Use-llvm-from-cling.patch @@ -1,10 +1,9 @@ -diff --unified --recursive --text xeus-cling-0.10.0/CMakeLists.txt xeus-cling-0.10.0-fixed/CMakeLists.txt ---- xeus-cling-0.10.0/CMakeLists.txt 2020-08-29 00:08:47.000000000 +0200 -+++ xeus-cling-0.10.0-fixed/CMakeLists.txt 2020-09-23 17:00:45.525608638 +0200 -@@ -46,58 +46,6 @@ +--- xeus-cling-0.15.0/CMakeLists.txt 2023-01-30 21:26:07.000000000 +0100 ++++ xeus-cling-0.15.0-fixed/CMakeLists.txt 2023-02-01 18:35:36.914901732 +0100 +@@ -50,59 +50,6 @@ "${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xcpp17/kernel.json" ) - + -####################### -# Rely on llvm-config # -####################### @@ -57,26 +56,27 @@ diff --unified --recursive --text xeus-cling-0.10.0/CMakeLists.txt xeus-cling-0. -include_directories(${LLVM_MAIN_INCLUDE_DIR}) -link_directories(${LLVM_LIBRARY_DIR}) -add_definitions(-DLLVM_DIR="${LLVM_BINARY_DIR}") - +- ################ # Dependencies # -@@ -110,8 +58,10 @@ - find_package(cppzmq ${cppzmq_REQUIRED_VERSION} REQUIRED) + ################ +@@ -112,8 +59,10 @@ + find_package(xeus-zmq ${xeus-zmq_REQUIRED_VERSION} REQUIRED) find_package(pugixml REQUIRED) - + -find_package(Clang REQUIRED) find_package(Cling REQUIRED) +find_package(Clang REQUIRED) +find_package(LLVM REQUIRED) +add_definitions(-DLLVM_DIR="${LLVM_INSTALL_PREFIX}") - find_package(cxxopts REQUIRED) - + find_package(argparse REQUIRED) + ######### -@@ -228,6 +178,7 @@ - +@@ -219,6 +168,7 @@ + target_include_directories(xeus-cling PUBLIC -+ $<BUILD_INTERFACE:${LLVM_INCLUDE_DIR}> ++ $<BUILD_INTERFACE:${LLVM_INCLUDE_DIR}> $<BUILD_INTERFACE:${XEUS_CLING_INCLUDE_DIR}> $<INSTALL_INTERFACE:include>) - target_link_libraries(xeus-cling PUBLIC clingInterpreter clingMetaProcessor clingUtils xeus pugixml cxxopts::cxxopts) + target_link_libraries(xeus-cling PUBLIC clingInterpreter clingMetaProcessor clingUtils xeus-zmq pugixml argparse::argparse) |