diff options
| author | manuel <manuel@mausz.at> | 2016-11-24 21:27:41 +0100 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2016-11-24 21:27:41 +0100 |
| commit | 8cdf8dec703d882b46ca50a769fabb95ffc48e2c (patch) | |
| tree | f7fe8233508f79d3dc94f8f445ce6342e7dfbdbb /project/cmake/addons/bootstrap/CMakeLists.txt | |
| parent | 5823b05feb29a59510c32a9c28ca18b50b9b6399 (diff) | |
| download | kodi-pvr-build-8cdf8dec703d882b46ca50a769fabb95ffc48e2c.tar.gz kodi-pvr-build-8cdf8dec703d882b46ca50a769fabb95ffc48e2c.tar.bz2 kodi-pvr-build-8cdf8dec703d882b46ca50a769fabb95ffc48e2c.zip | |
sync with upstream
Diffstat (limited to 'project/cmake/addons/bootstrap/CMakeLists.txt')
| -rw-r--r-- | project/cmake/addons/bootstrap/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/project/cmake/addons/bootstrap/CMakeLists.txt b/project/cmake/addons/bootstrap/CMakeLists.txt index 86950b8..c20b97e 100644 --- a/project/cmake/addons/bootstrap/CMakeLists.txt +++ b/project/cmake/addons/bootstrap/CMakeLists.txt | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | cmake_minimum_required(VERSION 3.1) | ||
| 1 | project(kodi-addons-bootstrap) | 2 | project(kodi-addons-bootstrap) |
| 2 | 3 | ||
| 3 | cmake_minimum_required(VERSION 2.8) | ||
| 4 | |||
| 5 | list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) | 4 | list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) |
| 6 | 5 | ||
| 7 | # make sure CMAKE_INSTALL_PREFIX is properly set | 6 | # make sure CMAKE_INSTALL_PREFIX is properly set |
| @@ -52,7 +51,7 @@ function(bootstrap_repo repo_id repo_url repo_revision) | |||
| 52 | -DPROJECT_SOURCE_DIR=<SOURCE_DIR> | 51 | -DPROJECT_SOURCE_DIR=<SOURCE_DIR> |
| 53 | -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} | 52 | -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} |
| 54 | -DADDONS_TO_BUILD=${ADDONS_TO_BUILD} | 53 | -DADDONS_TO_BUILD=${ADDONS_TO_BUILD} |
| 55 | -P ${PROJECT_SOURCE_DIR}/bootstrap.cmake | 54 | -P ${PROJECT_SOURCE_DIR}/Bootstrap.cmake |
| 56 | ) | 55 | ) |
| 57 | endfunction() | 56 | endfunction() |
| 58 | 57 | ||
| @@ -61,7 +60,7 @@ set(REPOSITORY_TO_BUILD_FOUND OFF) | |||
| 61 | file(GLOB repos repositories/*.txt) | 60 | file(GLOB repos repositories/*.txt) |
| 62 | foreach(repo ${repos}) | 61 | foreach(repo ${repos}) |
| 63 | file(STRINGS ${repo} repo_definition) | 62 | file(STRINGS ${repo} repo_definition) |
| 64 | separate_arguments(repo_definition) | 63 | string(REPLACE " " ";" repo_definition ${repo_definition}) |
| 65 | list(GET repo_definition 0 repo_id) | 64 | list(GET repo_definition 0 repo_id) |
| 66 | 65 | ||
| 67 | list(FIND REPOSITORY_TO_BUILD ${repo_id} idx) | 66 | list(FIND REPOSITORY_TO_BUILD ${repo_id} idx) |
