tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix installations that use DESTDIR 

fixes #11574
This commit is contained in:
Gunnar Beutner 2016-04-13 09:32:08 +02:00
parent 58a35fe182
commit f75739399c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/InstallConfig.cmake
View File

@ -26,6 +26,11 @@ function(install_if_not_exists src dest)
string(REPLACE "/" "\\\\" nsis_dest_dir "${real_dest}") string(REPLACE "/" "\\\\" nsis_dest_dir "${real_dest}")
string(REPLACE "/" "\\\\" nsis_dest "${real_dest}/${basename_dest}") string(REPLACE "/" "\\\\" nsis_dest "${real_dest}/${basename_dest}")
install(CODE " install(CODE "
if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
set(target_dir \${CMAKE_INSTALL_PREFIX})
else()
set(target_dir \$ENV{DESTDIR})
endif()
if(\${CMAKE_INSTALL_PREFIX} MATCHES .*/_CPack_Packages/.* OR NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${skel_prefix}${dest}/${src_name}\") if(\${CMAKE_INSTALL_PREFIX} MATCHES .*/_CPack_Packages/.* OR NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${skel_prefix}${dest}/${src_name}\")
message(STATUS \"Installing: \$ENV{DESTDIR}${dest}/${src_name}\") message(STATUS \"Installing: \$ENV{DESTDIR}${dest}/${src_name}\")
if(\${CMAKE_INSTALL_PREFIX} MATCHES .*/_CPack_Packages/.*) if(\${CMAKE_INSTALL_PREFIX} MATCHES .*/_CPack_Packages/.*)
@ -34,14 +39,14 @@ function(install_if_not_exists src dest)
set(skel_prefix \"\") set(skel_prefix \"\")
endif() endif()
execute_process(COMMAND \${CMAKE_COMMAND} -E copy \"${src}\" execute_process(COMMAND \${CMAKE_COMMAND} -E copy \"${src}\"
\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${skel_prefix}${dest}/${src_name}\" \"\${target_dir}/\${skel_prefix}${dest}/${src_name}\"
RESULT_VARIABLE copy_result RESULT_VARIABLE copy_result
ERROR_VARIABLE error_output) ERROR_VARIABLE error_output)
if(copy_result) if(copy_result)
message(FATAL_ERROR \${error_output}) message(FATAL_ERROR \${error_output})
endif() endif()
else() else()
message(STATUS \"Skipping : \$ENV{DESTDIR}${dest}/${src_name}\") message(STATUS \"Skipping : \${target_dir}/${dest}/${src_name}\")
endif() endif()
") ")
endfunction(install_if_not_exists) endfunction(install_if_not_exists)