diff options
| author | Alwin Esch <alwin.esch@web.de> | 2017-05-27 13:04:13 +0200 |
|---|---|---|
| committer | Alwin Esch <alwin.esch@web.de> | 2017-05-27 13:04:13 +0200 |
| commit | 364de149778d5340329c834d7897a436d5dbb81b (patch) | |
| tree | f1c1fd9ea31228d4b7d289b559be7de09eae4452 | |
| parent | 0961d8e09699f924e44e2ddbb2177ad4fdb1f483 (diff) | |
[cmake] improve addon include check
After them can be also a folder as DEPENDS value added to versions.h.
Prevent amount of same depend files who used on different types or where
much present.
| -rw-r--r-- | cmake/scripts/common/AddonHelpers.cmake | 2 | ||||
| -rw-r--r-- | xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/scripts/common/AddonHelpers.cmake b/cmake/scripts/common/AddonHelpers.cmake index e4d685bc21..afa0459777 100644 --- a/cmake/scripts/common/AddonHelpers.cmake +++ b/cmake/scripts/common/AddonHelpers.cmake @@ -118,7 +118,7 @@ macro (build_addon target prefix libs) string(REPLACE " " ";" loop_var "${loop_var}") list(GET loop_var 1 include_name) string(REGEX REPLACE "[<>\"]|kodi/" "" include_name "${include_name}") - if(include_name STREQUAL ${depend_header}) + if(include_name MATCHES ${depend_header}) set(ADDON_DEPENDS "${ADDON_DEPENDS}\n<import addon=\"${${xml_entry_name}}\" version=\"${${depends_name}}\"/>") # Inform with them the addon header about used type add_definitions(-D${used_type_name}) diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h index 82103ed62d..bf69baf260 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h @@ -51,8 +51,8 @@ "kodi_audioengine_types.h" \ "libKODI_audioengine.h" \ "libXBMC_addon.h" \ - "addon-instance/Screensaver.h" -// @note "addon-instance/Screensaver.h" above must be improved to check only to included directory with "addon-instance"! + "addon-instance/" + #define ADDON_GLOBAL_VERSION_GUI "5.11.0" #define ADDON_GLOBAL_VERSION_GUI_MIN "5.10.0" #define ADDON_GLOBAL_VERSION_GUI_XML_ID "kodi.binary.global.gui" |