sync with upstream

2 files changed, 7 insertions, 9 deletions

diff --git a/project/cmake/addons/bootstrap/bootstrap.cmake b/project/cmake/addons/bootstrap/Bootstrap.cmake
index 25e8aa2..5d20302 100644
--- a/project/cmake/addons/bootstrap/bootstrap.cmake
+++ b/project/cmake/addons/bootstrap/Bootstrap.cmake
@@ -11,7 +11,7 @@ if(NOT ADDONS_TO_BUILD)
 else()
   string(STRIP "${ADDONS_TO_BUILD}" ADDONS_TO_BUILD)
   message(STATUS "Bootstrapping following addons: ${ADDONS_TO_BUILD}")
-  separate_arguments(ADDONS_TO_BUILD)
+  string(REPLACE " " ";" ADDONS_TO_BUILD ${ADDONS_TO_BUILD})
 endif()
 
 # find all addon definitions and go through them
@@ -21,16 +21,15 @@ foreach(ADDON_DEFINITION_FILE ${ADDON_DEFINITIONS})
   if(NOT (ADDON_DEFINITION_FILE MATCHES platforms.txt))
     # read the addon definition file
     file(STRINGS ${ADDON_DEFINITION_FILE} ADDON_DEFINITION)
-    separate_arguments(ADDON_DEFINITION)
+    string(REPLACE " " ";" ADDON_DEFINITION ${ADDON_DEFINITION})
 
     # extract the addon definition's identifier
     list(GET ADDON_DEFINITION 0 ADDON_ID)
 
     # check if the addon definition should be built
-    list(FIND ADDONS_TO_BUILD ${ADDON_ID} ADDONS_TO_BUILD_IDX)
-    if(ADDONS_TO_BUILD_IDX GREATER -1 OR "${ADDONS_TO_BUILD}" STREQUAL "all")
+    if(ADDON_ID MATCHES "^${ADDONS_TO_BUILD}" OR ADDONS_TO_BUILD STREQUAL all)
       # get the path to the addon definition directory
-      get_filename_component(ADDON_DEFINITION_DIR ${ADDON_DEFINITION_FILE} PATH)
+      get_filename_component(ADDON_DEFINITION_DIR ${ADDON_DEFINITION_FILE} DIRECTORY)
 
       # install the addon definition
       message(STATUS "Bootstrapping ${ADDON_ID} addon...")
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 @@
+cmake_minimum_required(VERSION 3.1)
 project(kodi-addons-bootstrap)
 
-cmake_minimum_required(VERSION 2.8)
-
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 
 # make sure CMAKE_INSTALL_PREFIX is properly set
@@ -52,7 +51,7 @@ function(bootstrap_repo repo_id repo_url repo_revision)
                                       -DPROJECT_SOURCE_DIR=<SOURCE_DIR>
                                       -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
                                       -DADDONS_TO_BUILD=${ADDONS_TO_BUILD}
-                                      -P ${PROJECT_SOURCE_DIR}/bootstrap.cmake
+                                      -P ${PROJECT_SOURCE_DIR}/Bootstrap.cmake
                       )
 endfunction()
 
@@ -61,7 +60,7 @@ set(REPOSITORY_TO_BUILD_FOUND OFF)
 file(GLOB repos repositories/*.txt)
 foreach(repo ${repos})
   file(STRINGS ${repo} repo_definition)
-  separate_arguments(repo_definition)
+  string(REPLACE " " ";" repo_definition ${repo_definition})
   list(GET repo_definition 0 repo_id)
 
   list(FIND REPOSITORY_TO_BUILD ${repo_id} idx)