aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authormontellese <montellese@xbmc.org>2015-02-13 09:44:11 +0100
committermontellese <montellese@xbmc.org>2015-02-18 09:18:46 +0100
commit97e9a44531b84c6c0c32969d28efba38efcbbf7f (patch)
tree4031927e21b3da3d49e270e5e5d36bc60a8642e1 /project
parent91cdebe22b4b33db25b79efae9626e740998c509 (diff)
cmake: only add a dependency to the list of an addon's dependencies if it has been downloaded and should be built
Diffstat (limited to 'project')
-rw-r--r--project/cmake/scripts/common/handle-depends.cmake8
1 files changed, 6 insertions, 2 deletions
diff --git a/project/cmake/scripts/common/handle-depends.cmake b/project/cmake/scripts/common/handle-depends.cmake
index 0e766fea7a..599c15ab3d 100644
--- a/project/cmake/scripts/common/handle-depends.cmake
+++ b/project/cmake/scripts/common/handle-depends.cmake
@@ -175,8 +175,12 @@ function(add_addon_depends addon searchpath)
endif()
endif()
- set(${addon}_DEPS ${${addon}_DEPS} ${id})
- set(${addon}_DEPS "${${addon}_DEPS}" PARENT_SCOPE)
+ # if the dependency is available for the target platform add it to the list of the addon's dependencies
+ # (even if the target already exists as it still has to be built before the addon)
+ if(${platform_found})
+ list(APPEND ${addon}_DEPS ${id})
+ set(${addon}_DEPS "${${addon}_DEPS}" PARENT_SCOPE)
+ endif()
endif()
endforeach()
endfunction()