Skip to content

[CMake] Revert to LLVM_LIBRARY_DIR in clingutils for builtin_clang=OFF #18407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[CMake] Revert to LLVM_LIBRARY_DIR in clingutils for builtin_clang=OFF #18407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions core/clingutils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,20 @@ foreach(dict ${stldicts})
endforeach()

if (builtin_clang)
set(CLANG_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/interpreter/llvm-project/llvm/${CMAKE_CFG_INTDIR})
set(CLANG_LIBRARY_DIR ${CMAKE_BINARY_DIR}/interpreter/llvm-project/llvm/${CMAKE_CFG_INTDIR}/lib)
else ()
# If no explicit Clang prefix is set, assume it lives inside LLVM prefix.
if(NOT DEFINED CLANG_INSTALL_PREFIX)
set(CLANG_INSTALL_PREFIX ${LLVM_DIR})
if(DEFINED CLANG_INSTALL_PREFIX)
set(CLANG_LIBRARY_DIR ${CLANG_INSTALL_PREFIX}/lib)
else()
# If no explicit Clang prefix is set, assume it lives inside LLVM prefix.
set(CLANG_LIBRARY_DIR ${LLVM_LIBRARY_DIR})
endif()
endif()

# We only look for the Clang version that matches the LLVM version, because other setups are not supported.
set(CLANG_RESOURCE_DIR_VERSION ${LLVM_VERSION_MAJOR})

set(CLANG_RESOURCE_DIR ${CLANG_INSTALL_PREFIX}/lib/clang/${CLANG_RESOURCE_DIR_VERSION}/include)
set(CLANG_RESOURCE_DIR ${CLANG_LIBRARY_DIR}/clang/${CLANG_RESOURCE_DIR_VERSION}/include)

#---Deal with clang resource here----------------------------------------------
install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/cling/lib/clang/${CLANG_RESOURCE_DIR_VERSION}/include/
Expand Down
Loading