Skip to content
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

Jump to bottom

Unset useless Runpath vars and improve stability #5

Merged
merged 2 commits into from
Oct 23, 2023
Merged

Unset useless Runpath vars and improve stability #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce04270
perf: unset prefix _ variables
msclock Oct 23, 2023
dc4e982
perf: improve install stability
msclock Oct 23, 2023
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
38 changes: 35 additions & 3 deletions cmake/install/Common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,32 @@ endfunction()

#[[
A function to provide a target to uninstall things from the command `cmake install`.

It will create a file ``cmake_uninstall.cmake`` in the build directory and add a
custom target ``uninstall`` (or ``UNINSTALL`` on Visual Studio and Xcode) that
will remove the files installed by your package (using ``install_manifest.txt``).
See also https://gitlab.kitware.com/cmake/community/wikis/FAQ#can-i-do-make-uninstall-with-cmake

]]
function(create_uninstall_target)
# AddUninstallTarget works only when included in the main CMakeLists.txt
if(NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
return()
endif()

# The name of the target is uppercase in MSVC and Xcode (for coherence with
# the other standard targets)
if("${CMAKE_GENERATOR}" MATCHES "^(Visual Studio|Xcode)")
set(_uninstall "UNINSTALL")
else()
set(_uninstall "uninstall")
endif()

# If target is already defined don't do anything
if(TARGET ${_uninstall})
return()
endif()

set(uninstall_script_config
"if(NOT EXISTS \"@CMAKE_BINARY_DIR@/install_manifest.txt\")
message(FATAL_ERROR \"Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt\")
Expand Down Expand Up @@ -269,13 +293,21 @@ endforeach()
file(WRITE "${CMAKE_BINARY_DIR}/${_uninstall_file}.in"
${uninstall_script_config})

set(_comment COMMENT "Uninstall the project...")

# uninstall target
if(NOT TARGET uninstall)
if(NOT TARGET ${_uninstall})
configure_file("${CMAKE_BINARY_DIR}/${_uninstall_file}.in"
"${CMAKE_BINARY_DIR}/${_uninstall_file}" IMMEDIATE @ONLY)

add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P
${CMAKE_BINARY_DIR}/${_uninstall_file})
add_custom_target(
${_uninstall}
${_comment}
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/${_uninstall_file}
BYPRODUCTS uninstall_byproduct)
set_property(SOURCE uninstall_byproduct PROPERTY SYMBOLIC 1)

set_property(TARGET ${_uninstall} PROPERTY FOLDER "CMakePredefinedTargets")
endif()

endfunction()
2 changes: 2 additions & 0 deletions cmake/install/Runpath.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ endif()
# Append runtime path
list(APPEND CMAKE_INSTALL_RPATH ${_rpath};$ORIGIN)
message(STATUS "CMAKE_INSTALL_RPATH:${CMAKE_INSTALL_RPATH}")
unset(_rpath)
unset(_rel)

# Add a variable about platform shared library location
set(RUNPATH_SHARED_LOCATION
Expand Down