etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-30 15:23:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix up some dependency logic in component resolving

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2023-09-30 05:33:08 +02:00 committed by Xaymar
parent 4cf2a399f4
commit 92ddbd1330
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -1080,7 +1080,7 @@ function(streamfx_add_component COMPONENT_NAME)
# If there is a resolver function, register it. # If there is a resolver function, register it.
if(_ARG_RESOLVER) if(_ARG_RESOLVER)
set_target_properties(${COMPONENT_TARGET} set_target_properties(${COMPONENT_TARGET} PROPERTIES
COMPONENT_RESOLVER "${_ARG_RESOLVER}" COMPONENT_RESOLVER "${_ARG_RESOLVER}"
) )
endif() endif()
@ -1227,7 +1227,9 @@ function(streamfx_disable_component _NAME)
) )
streamfx_sanitize_name("${_NAME}" _NAME _TARGET _OPTION) streamfx_sanitize_name("${_NAME}" _NAME _TARGET _OPTION)
set(_TARGET "StreamFX_${_TARGET}") if(NOT (_TARGET MATCHES "^StreamFX_"))
set(_TARGET "StreamFX_${_TARGET}")
endif()
# If the component doesn't exist, skip it. # If the component doesn't exist, skip it.
if(NOT TARGET ${_TARGET}) if(NOT TARGET ${_TARGET})
@ -1458,6 +1460,7 @@ while(_UNRESOLVED)
foreach(_ENTITY ${_UNRESOLVED}) foreach(_ENTITY ${_UNRESOLVED})
set(RENTITY "StreamFX_${_ENTITY}") set(RENTITY "StreamFX_${_ENTITY}")
get_target_property(_ALIAS "${RENTITY}" COMPONENT_NAME)
get_target_property(_LABEL "${RENTITY}" COMPONENT_LABEL) get_target_property(_LABEL "${RENTITY}" COMPONENT_LABEL)
get_target_property(_OPTION "${RENTITY}" COMPONENT_OPTION) get_target_property(_OPTION "${RENTITY}" COMPONENT_OPTION)
get_target_property(_DEPENDS "${RENTITY}" COMPONENT_DEPENDS) get_target_property(_DEPENDS "${RENTITY}" COMPONENT_DEPENDS)
@ -1520,6 +1523,9 @@ while(_UNRESOLVED)
# Call Resolver function # Call Resolver function
if(_RESOLVER) if(_RESOLVER)
set(COMPONENT_TARGET "${RENTITY}")
set(COMPONENT_ALIAS "${_ALIAS}")
set(COMPONENT_OPTION "${_OPTION}")
cmake_language(CALL ${_RESOLVER}) cmake_language(CALL ${_RESOLVER})
endif() endif()
if(${_OPTION}_DISABLED) # Test for resolve disabling. if(${_OPTION}_DISABLED) # Test for resolve disabling.