1berry/obs-studio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: Fix rundir installation accepting DESTDIR environment variable

Browse Source 
The environment variable DESTDIR is commonly used to specify an install-
time prefix for installation of build artifacts (e.g. for staging an
installation in a temporary directory while keeping the overall prefixes
intact).

This variable should be ignored by all targets but the install target,
which requires us to set it to an empty string/path when we use
`install` to set up our rundir.
This commit is contained in:
PatTheMav 2022-09-12 18:57:33 +02:00 committed by Jim
parent fbb7b93226
commit 2c8a55f82b
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cmake/Modules/ObsHelpers.cmake
View File

@ -57,9 +57,9 @@ function(setup_binary_target target)
TARGET ${target} TARGET ${target}
POST_BUILD POST_BUILD
COMMAND COMMAND
"${CMAKE_COMMAND}" --install .. --config $<CONFIG> --prefix "${CMAKE_COMMAND}" -E env DESTDIR= "${CMAKE_COMMAND}" --install ..
${OBS_OUTPUT_DIR}/$<CONFIG> --component obs_${target} > --config $<CONFIG> --prefix ${OBS_OUTPUT_DIR}/$<CONFIG> --component
"$<IF:$<PLATFORM_ID:Windows>,nul,/dev/null>" obs_${target} > "$<IF:$<PLATFORM_ID:Windows>,nul,/dev/null>"
COMMENT "Installing OBS rundir" COMMENT "Installing OBS rundir"
VERBATIM) VERBATIM)
@ -91,9 +91,9 @@ function(setup_plugin_target target)
TARGET ${target} TARGET ${target}
POST_BUILD POST_BUILD
COMMAND COMMAND
"${CMAKE_COMMAND}" --install .. --config $<CONFIG> --prefix "${CMAKE_COMMAND}" -E env DESTDIR= "${CMAKE_COMMAND}" --install ..
${OBS_OUTPUT_DIR}/$<CONFIG> --component obs_${target} > --config $<CONFIG> --prefix ${OBS_OUTPUT_DIR}/$<CONFIG> --component
"$<IF:$<PLATFORM_ID:Windows>,nul,/dev/null>" obs_${target} > "$<IF:$<PLATFORM_ID:Windows>,nul,/dev/null>"
COMMENT "Installing ${target} to OBS rundir" COMMENT "Installing ${target} to OBS rundir"
VERBATIM) VERBATIM)
@ -131,9 +131,9 @@ function(setup_script_plugin_target target)
TARGET ${target} TARGET ${target}
POST_BUILD POST_BUILD
COMMAND COMMAND
"${CMAKE_COMMAND}" --install .. --config $<CONFIG> --prefix "${CMAKE_COMMAND}" -E env DESTDIR= "${CMAKE_COMMAND}" --install ..
${OBS_OUTPUT_DIR}/$<CONFIG> --component obs_${target} > --config $<CONFIG> --prefix ${OBS_OUTPUT_DIR}/$<CONFIG> --component
"$<IF:$<PLATFORM_ID:Windows>,nul,/dev/null>" obs_${target} > "$<IF:$<PLATFORM_ID:Windows>,nul,/dev/null>"
COMMENT "Installing ${target} to OBS rundir" COMMENT "Installing ${target} to OBS rundir"
VERBATIM) VERBATIM)
@ -201,9 +201,9 @@ function(setup_obs_app target)
TARGET ${target} TARGET ${target}
POST_BUILD POST_BUILD
COMMAND COMMAND
"${CMAKE_COMMAND}" --install .. --config $<CONFIG> --prefix "${CMAKE_COMMAND}" -E env DESTDIR= "${CMAKE_COMMAND}" --install ..
${OBS_OUTPUT_DIR}/$<CONFIG> --component obs_rundir > --config $<CONFIG> --prefix ${OBS_OUTPUT_DIR}/$<CONFIG> --component
"$<IF:$<PLATFORM_ID:Windows>,nul,/dev/null>" obs_rundir > "$<IF:$<PLATFORM_ID:Windows>,nul,/dev/null>"
COMMENT "Installing OBS rundir" COMMENT "Installing OBS rundir"
VERBATIM) VERBATIM)
endfunction() endfunction()
@ -540,9 +540,9 @@ function(_install_obs_datatarget target destination)
TARGET ${target} TARGET ${target}
POST_BUILD POST_BUILD
COMMAND COMMAND
"${CMAKE_COMMAND}" --install .. --config $<CONFIG> --prefix "${CMAKE_COMMAND}" -E env DESTDIR= "${CMAKE_COMMAND}" --install ..
${OBS_OUTPUT_DIR}/$<CONFIG> --component obs_${target} > --config $<CONFIG> --prefix ${OBS_OUTPUT_DIR}/$<CONFIG> --component
"$<IF:$<PLATFORM_ID:Windows>,nul,/dev/null>" obs_${target} > "$<IF:$<PLATFORM_ID:Windows>,nul,/dev/null>"
COMMENT "Installing ${target} to OBS rundir" COMMENT "Installing ${target} to OBS rundir"
VERBATIM) VERBATIM)
endfunction() endfunction()