mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-11 09:02:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1400 from jszakmeister/install-helpers-destdir

Browse Source 
build: fix the usage of DESTDIR in InstallHelpers.cmake
This commit is contained in:
John Szakmeister
2014-11-09 05:03:05 -05:00
parent c9df7ba308 938faf5e2d
commit 1ea90f6971
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmake/InstallHelpers.cmake
View File

@@ -22,19 +22,21 @@ function(create_install_dir_with_perms)
install(CODE install(CODE
" "
if(ENV{DESTDIR}) if(DEFINED ENV{DESTDIR} AND NOT IS_ABSOLUTE \${CMAKE_INSTALL_PREFIX})
# TODO(fwalch): Is this branch ever taken (#1381, #1387)? message(FATAL_ERROR \"Install prefix must be absolute when using DESTDIR\")
set(PREFIX \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX})
else()
set(PREFIX \${CMAKE_INSTALL_PREFIX})
endif() endif()
set(_current_dir \"\${PREFIX}/${_install_dir_DESTINATION}\") set(_current_dir \"\${CMAKE_INSTALL_PREFIX}/${_install_dir_DESTINATION}\")
set(_dir_permissions \"${_install_dir_DIRECTORY_PERMISSIONS}\") set(_dir_permissions \"${_install_dir_DIRECTORY_PERMISSIONS}\")
set(_parent_dirs) set(_parent_dirs)
while(NOT EXISTS \${_current_dir}) set(_prev_dir)
# Explicitly prepend DESTDIR when using EXISTS.
# file(INSTALL ...) implicitly respects DESTDIR, but EXISTS does not.
while(NOT EXISTS \$ENV{DESTDIR}\${_current_dir} AND NOT \${_prev_dir} STREQUAL \${_current_dir})
list(APPEND _parent_dirs \${_current_dir}) list(APPEND _parent_dirs \${_current_dir})
set(_prev_dir \${_current_dir})
get_filename_component(_current_dir \${_current_dir} PATH) get_filename_component(_current_dir \${_current_dir} PATH)
endwhile() endwhile()
@@ -47,6 +49,8 @@ function(create_install_dir_with_perms)
# 3.0.2. # 3.0.2.
foreach(_current_dir \${_parent_dirs}) foreach(_current_dir \${_parent_dirs})
if(NOT IS_DIRECTORY \${_current_dir}) if(NOT IS_DIRECTORY \${_current_dir})
# file(INSTALL ...) implicitly respects DESTDIR, so there's no need to
# prepend it here.
file(INSTALL DESTINATION \${_current_dir} file(INSTALL DESTINATION \${_current_dir}
TYPE DIRECTORY TYPE DIRECTORY
DIR_PERMISSIONS \${_dir_permissions} DIR_PERMISSIONS \${_dir_permissions}