Skip to content

[cmake] Handle absolute install_dir in relative RPATH resolution #21786

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

Open
guitargeek wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −2
Open

[cmake] Handle absolute install_dir in relative RPATH resolution #21786

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
13 changes: 11 additions & 2 deletions cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2266,10 +2266,19 @@ endfunction()
#
# Arguments:
# target - The CMake target (e.g., a shared library or executable)
# install_dir - The install subdirectory relative to CMAKE_INSTALL_PREFIX
# install_dir - The install subdirectory relative to CMAKE_INSTALL_PREFIX,
# or an absolute directory.
#----------------------------------------------------------------------------
function(ROOT_APPEND_LIBDIR_TO_INSTALL_RPATH target install_dir)
cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR BASE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${install_dir}" OUTPUT_VARIABLE to_libdir)

# Check if install_dir is absolute
if(IS_ABSOLUTE "${install_dir}")
set(base_dir "${install_dir}")
else()
set(base_dir "${CMAKE_INSTALL_PREFIX}/${install_dir}")
endif()

cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR BASE_DIRECTORY "${base_dir}" OUTPUT_VARIABLE to_libdir)

# New path
if(APPLE)
Expand Down
Loading