aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorCristiano Silva <hudokkow@gmail.com>2018-05-24 08:33:29 +0100
committerGitHub <noreply@github.com>2018-05-24 08:33:29 +0100
commitc49d783988a6c1c3adaabfe1425f42e85d3a5ef1 (patch)
tree969dc4bf3ba06f46c36fc81bfe0f5417b0a81514 /cmake
parent6daaa5a26683111b3fd40f7bd7e750ff900dc562 (diff)
parent629bc83446a95bffa48873b110f4b5ce90dabe8e (diff)
Merge pull request #13873 from hudokkow/app_mirrors
[cmake] Cosmetics: core_find_versions
Diffstat (limited to 'cmake')
-rw-r--r--cmake/scripts/common/Macros.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/scripts/common/Macros.cmake b/cmake/scripts/common/Macros.cmake
index c21069d9cd..d90621db21 100644
--- a/cmake/scripts/common/Macros.cmake
+++ b/cmake/scripts/common/Macros.cmake
@@ -687,6 +687,7 @@ endfunction()
# APP_NAME_UC - uppercased app name
# APP_PACKAGE - Android full package name
# COMPANY_NAME - company name
+# APP_WEBSITE - site url
# APP_VERSION_MAJOR - the app version major
# APP_VERSION_MINOR - the app version minor
# APP_VERSION_TAG - the app version tag
@@ -711,7 +712,7 @@ 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}")
- set(version_props
+ set(version_props
ADDON_API
APP_NAME
APP_PACKAGE
@@ -761,6 +762,9 @@ macro(core_find_versions)
# unset variables not used anywhere else
unset(version_list)
unset(APP_APP_NAME)
+ unset(APP_COMPANY_NAME)
+ unset(APP_APP_PACKAGE)
+ unset(APP_JSONRPC_VERSION)
unset(BIN_ADDON_PARTS)
# bail if we can't parse version.txt