diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/scripts/android/Install.cmake | 2 | ||||
| -rw-r--r-- | cmake/scripts/common/Macros.cmake | 17 | ||||
| -rw-r--r-- | cmake/treedata/common/subdirs.txt | 1 |
3 files changed, 19 insertions, 1 deletions
diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake index bcffc39978..e1eaaa3d5b 100644 --- a/cmake/scripts/android/Install.cmake +++ b/cmake/scripts/android/Install.cmake @@ -137,6 +137,8 @@ foreach(target apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb apk-clean CC=${CMAKE_C_COMPILER} CPU=${CPU} ARCH=${ARCH} + HOST=${HOST} + TOOLCHAIN=${TOOLCHAIN} PREFIX=${prefix} DEPENDS_PATH=${DEPENDS_PATH} NDKROOT=${NDKROOT} diff --git a/cmake/scripts/common/Macros.cmake b/cmake/scripts/common/Macros.cmake index 0d509ce101..d508f87f33 100644 --- a/cmake/scripts/common/Macros.cmake +++ b/cmake/scripts/common/Macros.cmake @@ -668,7 +668,22 @@ macro(core_find_versions) core_file_read_filtered(version_list ${CORE_SOURCE_DIR}/version.txt) core_file_read_filtered(json_version ${CORE_SOURCE_DIR}/xbmc/interfaces/json-rpc/schema/version.txt) string(REGEX REPLACE "([^ ;]*) ([^;]*)" "\\1;\\2" version_list "${version_list};${json_version}") - cmake_parse_arguments(APP "" "APP_NAME;COMPANY_NAME;WEBSITE;VERSION_MAJOR;VERSION_MINOR;VERSION_TAG;VERSION_CODE;ADDON_API;APP_PACKAGE;JSONRPC_VERSION" "" ${version_list}) + set(version_props + ADDON_API + APP_NAME + APP_PACKAGE + COMPANY_NAME + JSONRPC_VERSION + PACKAGE_DESCRIPTION + PACKAGE_IDENTITY + PACKAGE_PUBLISHER + VERSION_MAJOR + VERSION_MINOR + VERSION_TAG + VERSION_CODE + WEBSITE + ) + cmake_parse_arguments(APP "" "${version_props}" "" ${version_list}) if(NOT ${APP_VERSION_CODE} MATCHES "^[0-9]+\\.[0-9][0-9]?\\.[0-9][0-9]?[0-9]?$") message(FATAL_ERROR "VERSION_CODE was set to ${APP_VERSION_CODE} in version.txt, but it has to match '^\\d+\\.\\d{1,2}\\.\\d{1,3}$'") diff --git a/cmake/treedata/common/subdirs.txt b/cmake/treedata/common/subdirs.txt index 0c34a28172..d5412b5ae5 100644 --- a/cmake/treedata/common/subdirs.txt +++ b/cmake/treedata/common/subdirs.txt @@ -42,5 +42,6 @@ xbmc/storage storage xbmc/threads threads xbmc/utils utils xbmc/view view +xbmc/weather weather xbmc/windowing windowing xbmc/windows windows |