Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions interpreter/cling/tools/plugins/clad/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,7 @@ if (LLVM_FORCE_USE_OLD_TOOLCHAIN)
list(APPEND _clad_extra_cmake_args -DLLVM_FORCE_USE_OLD_TOOLCHAIN=${LLVM_FORCE_USE_OLD_TOOLCHAIN})
endif(LLVM_FORCE_USE_OLD_TOOLCHAIN)

if (CLING_INCLUDE_TESTS)
list(APPEND _clad_extra_cmake_args -DLLVM_EXTERNAL_LIT=${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
else()
list(APPEND _clad_extra_cmake_args -DCLAD_BUILD_STATIC_ONLY=ON)
endif()
list(APPEND _clad_extra_cmake_args -DCLAD_BUILD_STATIC_ONLY=ON)

# Wrap download, configure and build steps in a script to log output
set(_clad_cmake_logging_settings
Expand Down Expand Up @@ -87,8 +83,12 @@ ExternalProject_Add(
-DLLVM_DIR=${LLVM_BINARY_DIR}
-DCLANG_INCLUDE_DIRS=${CLANG_INCLUDE_DIRS}
${_clad_extra_cmake_args}
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${_clad_build_type}
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --config ${_clad_build_type} --target install
# FIXME
# Building with 1 core is a temporary workaround for #16654 and has to be
# there until the behaviour of the clad build on ubuntu 24.10 is understood.
# The performance penalty in the build is negligible.
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${_clad_build_type} -j 1
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --config ${_clad_build_type} -j 1 --target install
BUILD_BYPRODUCTS ${CLAD_BYPRODUCTS}
${_clad_cmake_logging_settings}
# We need the target clangBasic to be built before building clad. However, we
Expand Down
Loading