diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2024-06-26 11:36:06 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-26 11:36:06 +1000 |
| commit | 433684672e645837c2741c0f6790333bced2c041 (patch) | |
| tree | 41da83a27b9f72908b8ee85fc3c021c2fae19749 | |
| parent | bc62f40ab9b5a8476c0887a03e06ab775661611a (diff) | |
| parent | 9cb351848fcf60a688bf80878711ba86c20386ea (diff) | |
Merge pull request #25370 from fuzzard/fix_cmake_buildtools
[cmake][macros] Enable buildtools to function after target migration of core/optional deps
| -rw-r--r-- | cmake/scripts/common/Macros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/scripts/common/Macros.cmake b/cmake/scripts/common/Macros.cmake index fcb9659de9..e3ae5ed9b1 100644 --- a/cmake/scripts/common/Macros.cmake +++ b/cmake/scripts/common/Macros.cmake @@ -429,11 +429,11 @@ function(core_optional_dep) set(_required True) endif() - if(TARGET kodi::${dep}) + if(TARGET ${APP_NAME_LC}::${dep} OR (${depup}_FOUND AND ${depspec} IN_LIST optional_buildtools)) set(final_message ${final_message} "${depup} enabled: Yes") # We dont want to add a build tool - if (NOT ${depspec} IN_LIST optional_buildtools AND NOT ${depspec} IN_LIST required_buildtools) + if (NOT ${depspec} IN_LIST optional_buildtools) # If dependency is found and is not in the list (eg mariadb/mysql) add to list if (NOT ${depspec} IN_LIST optional_deps) set(optional_deps ${optional_deps} ${depspec} PARENT_SCOPE) |