diff options
| author | montellese <montellese@xbmc.org> | 2014-11-09 01:26:18 +0100 |
|---|---|---|
| committer | montellese <montellese@xbmc.org> | 2014-11-09 01:42:00 +0100 |
| commit | 52b1a236734783bec48db85558709e4af70e75ac (patch) | |
| tree | 0ade1bdfcc92b2983b8b598106f4104b1f97c111 /project | |
| parent | 4df0ac90e89c468ed42a4ef10019630d66c58221 (diff) | |
binary addons: fix dependency handling for dependencies
Diffstat (limited to 'project')
| -rw-r--r-- | project/cmake/addons/depends/CMakeLists.txt | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/project/cmake/addons/depends/CMakeLists.txt b/project/cmake/addons/depends/CMakeLists.txt index 042a739690..6cff41dc60 100644 --- a/project/cmake/addons/depends/CMakeLists.txt +++ b/project/cmake/addons/depends/CMakeLists.txt @@ -107,21 +107,11 @@ foreach(file ${cmake_input_files}) set(INSTALL_COMMAND "") endif() - # check if there's a deps.txt containing dependencies on other libraries - if(EXISTS ${dir}/deps.txt}) - file(STRINGS ${dir}/deps.txt deps) - message(STATUS "${id} dependencies: ${deps}") - set(DEPENDS_COMMAND DEPENDS ${deps}) - else() - set(DEPENDS_COMMAND "") - endif() - # prepare the setup of the call to externalproject_add() set(EXTERNALPROJECT_SETUP PREFIX build/${id} CMAKE_ARGS ${BUILD_ARGS} PATCH_COMMAND ${PATCH_COMMAND} - "${INSTALL_COMMAND}" - "${DEPENDS_COMMAND}") + "${INSTALL_COMMAND}") # if there's an url defined we need to pass that to externalproject_add() if(DEFINED url AND NOT "${url}" STREQUAL "") @@ -147,6 +137,13 @@ foreach(file ${cmake_input_files}) "${EXTERNALPROJECT_SETUP}" ) endif() + + # check if there's a deps.txt containing dependencies on other libraries + if(EXISTS ${dir}/deps.txt) + file(STRINGS ${dir}/deps.txt deps) + message(STATUS "${id} dependencies: ${deps}") + add_dependencies(${id} ${deps}) + endif() endif() endif() endforeach() |