gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix building ROOT with external llvm.

Browse Source 
Fixes #8141.
This commit is contained in:
Vassil Vassilev 2021-07-28 19:09:24 +00:00 committed by jenkins
parent 8e950be75d
commit d78d1a03fe
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Interpreter/CMakeLists.txt
View File

@ -344,3 +344,29 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cling-compiledata.h
add_file_dependencies(${CMAKE_CURRENT_SOURCE_DIR}/CIFactory.cpp
${CMAKE_CURRENT_BINARY_DIR}/cling-compiledata.h)
# If LLVM is external, but Clang is builtin, we must use some files
# from patched (builtin) version of LLVM
if ((NOT builtin_llvm) AND builtin_clang)
set(FixInclude "${CMAKE_SOURCE_DIR}/interpreter/llvm/src/include")
get_property(P SOURCE IncrementalJIT.cpp PROPERTY INCLUDE_DIRECTORIES)
list(INSERT P 0 ${FixInclude})
set_property(SOURCE IncrementalJIT.cpp PROPERTY INCLUDE_DIRECTORIES "${P}")
get_property(P SOURCE IncrementalExecutor.cpp PROPERTY INCLUDE_DIRECTORIES)
list(INSERT P 0 ${FixInclude})
set_property(SOURCE IncrementalExecutor.cpp PROPERTY INCLUDE_DIRECTORIES "${P}")
get_property(P SOURCE Interpreter.cpp PROPERTY INCLUDE_DIRECTORIES)
list(INSERT P 0 ${FixInclude})
set_property(SOURCE Interpreter.cpp PROPERTY INCLUDE_DIRECTORIES "${P}")
get_property(P SOURCE Transaction.cpp PROPERTY INCLUDE_DIRECTORIES)
list(INSERT P 0 ${FixInclude})
set_property(SOURCE Transaction.cpp PROPERTY INCLUDE_DIRECTORIES "${P}")
get_property(P SOURCE TransactionUnloader.cpp PROPERTY INCLUDE_DIRECTORIES)
list(INSERT P 0 ${FixInclude})
set_property(SOURCE TransactionUnloader.cpp PROPERTY INCLUDE_DIRECTORIES "${P}")
endif()

2
tools/plugins/clad/CMakeLists.txt
View File

@ -40,7 +40,7 @@ if (CMAKE_CXX_STANDARD)
endif(CMAKE_CXX_STANDARD)
if (Clang_DIR)
list(APPEND _clad_extra_cmake_args -DClang_DIR=${Clang_DIR})
list(APPEND _clad_extra_cmake_args -DClang_DIR=${Clang_DIR} -DClang_CONFIG_EXTRA_PATH_HINTS=${Clang_Config_ExtraPathHints})
endif(Clang_DIR)
if (LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN)