sync with upstream

19 files changed, 1198 insertions, 977 deletions

diff --git a/project/cmake/scripts/common/AddOptions.cmake b/project/cmake/scripts/common/AddOptions.cmake
new file mode 100644
index 0000000..96837c1
--- /dev/null
+++ b/project/cmake/scripts/common/AddOptions.cmake
@@ -0,0 +1,78 @@
+# - Add options without repeating them on the command line
+#
+# Synopsis:
+#
+#       add_options (lang build opts)
+#
+# where:
+#
+#       lang       Name of the language whose compiler should receive the
+#                  options, e.g. CXX. If a comma-separated list is received
+#                  then the option is added for all those languages. Use the
+#                  special value ALL_LANGUAGES for these languages: CXX, C
+#                  and Fortran
+#
+#       build      Kind of build to which this options should apply,
+#              such as DEBUG and RELEASE. This can also be a comma-
+#                  separated list. Use the special value ALL_BUILDS to apply
+#                  to all builds.
+#
+#       opts       List of options to add. Each should be quoted.
+#
+# Example:
+#
+#       add_options (CXX RELEASE "-O3" "-DNDEBUG" "-Wall")
+
+function(add_options langs builds)
+  # special handling of empty language specification
+  if("${langs}" STREQUAL "ALL_LANGUAGES")
+        set(langs CXX C Fortran)
+  endif()
+  foreach(lang IN LISTS langs)
+        # prepend underscore if necessary
+        foreach(build IN LISTS builds)
+          if(NOT ("${build}" STREQUAL "ALL_BUILDS"))
+                set(_bld "_${build}")
+                string(TOUPPER "${_bld}" _bld)
+          else()
+                set(_bld "")
+          endif()
+          foreach(_opt IN LISTS ARGN)
+                set(_var "CMAKE_${lang}_FLAGS${_bld}")
+                #message(STATUS "Adding \"${_opt}\" to \${${_var}}")
+                # remove it first
+                string(REPLACE "${_opt}" "" _without "${${_var}}")
+                string(STRIP "${_without}" _without)
+                # we need to strip this one as well, so they are comparable
+                string(STRIP "${${_var}}" _stripped)
+                # if it wasn't there, then add it at the end
+                if("${_without}" STREQUAL "${_stripped}")
+                  # don't add any extra spaces if no options yet are set
+                  if(NOT ${_stripped} STREQUAL "")
+                        set(${_var} "${_stripped} ${_opt}")
+                  else()
+                        set(${_var} "${_opt}")
+                  endif()
+                  set(${_var} "${${_var}}" PARENT_SCOPE)
+                endif()
+          endforeach()
+        endforeach()
+  endforeach()
+endfunction()
+
+# set varname to flag unless user has specified something that matches regex
+function(set_default_option varname flag regex)
+  if(NOT "$ENV{CXXFLAGS}" MATCHES "${regex}"
+          AND NOT "${CMAKE_CXX_FLAGS}" MATCHES "${regex}"
+          AND NOT "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}" MATCHES "${regex}")
+        set(${varname} ${flag} PARENT_SCOPE)
+  else()
+        set(${varname} PARENT_SCOPE)
+  endif()
+endfunction()
+
+# note: this must be called before project()
+macro(no_default_options)
+  # prevent the platform probe to set options
+  set(CMAKE_NOT_USING_CONFIG_FLAGS TRUE)
+endmacro()
diff --git a/project/cmake/scripts/common/AddonHelpers.cmake b/project/cmake/scripts/common/AddonHelpers.cmake
new file mode 100644
index 0000000..6680ed1
--- /dev/null
+++ b/project/cmake/scripts/common/AddonHelpers.cmake
@@ -0,0 +1,268 @@
+# Workaround for the fact that cpack's filenames are not customizable.
+# Each add-on is added as a separate component to facilitate zip/tgz packaging.
+# The filenames are always of the form basename-component, which is 
+# incompatible with the addonid-version scheme we want. This hack renames
+# the files from the file names generated by the 'package' target.
+# Sadly we cannot extend the 'package' target, as it is a builtin target, see 
+# http://public.kitware.com/Bug/view.php?id=8438
+# Thus, we have to add an 'addon-package' target.
+add_custom_target(addon-package
+                  COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package)
+
+macro(add_cpack_workaround target version ext)
+  if(NOT PACKAGE_DIR)
+    set(PACKAGE_DIR "${CMAKE_INSTALL_PREFIX}/zips")
+  endif()
+
+  add_custom_command(TARGET addon-package PRE_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E make_directory ${PACKAGE_DIR}
+                     COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_PACKAGE_DIRECTORY}/addon-${target}-${version}.${ext} ${PACKAGE_DIR}/${target}-${version}.${ext})
+endmacro()
+
+# Grab the version from a given add-on's addon.xml
+macro (addon_version dir prefix)
+  if(EXISTS ${PROJECT_SOURCE_DIR}/${dir}/addon.xml.in)
+    file(READ ${PROJECT_SOURCE_DIR}/${dir}/addon.xml.in ADDONXML)
+  else()
+    file(READ ${dir}/addon.xml ADDONXML)
+  endif()
+
+  string(REGEX MATCH "<addon[^>]*version.?=.?.[0-9\\.]+" VERSION_STRING ${ADDONXML}) 
+  string(REGEX REPLACE ".*version=.([0-9\\.]+).*" "\\1" ${prefix}_VERSION ${VERSION_STRING})
+  message(STATUS ${prefix}_VERSION=${${prefix}_VERSION})
+endmacro()
+
+# Build, link and optionally package an add-on
+macro (build_addon target prefix libs)
+  addon_version(${target} ${prefix})
+  if(${prefix}_SOURCES)
+    add_library(${target} ${${prefix}_SOURCES})
+    target_link_libraries(${target} ${${libs}})
+    set_target_properties(${target} PROPERTIES VERSION ${${prefix}_VERSION}
+                                               SOVERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}
+                                               PREFIX "")
+    if(OS STREQUAL "android")
+      set_target_properties(${target} PROPERTIES PREFIX "lib")
+    endif()
+  elseif(${prefix}_CUSTOM_BINARY)
+    add_custom_target(${target} ALL)
+  endif()
+
+  # get the library's location
+  if(${prefix}_CUSTOM_BINARY)
+    list(GET ${prefix}_CUSTOM_BINARY 0 LIBRARY_LOCATION)
+    list(GET ${prefix}_CUSTOM_BINARY 1 LIBRARY_FILENAME)
+  else()
+    set(LIBRARY_LOCATION $<TARGET_FILE:${target}>)
+    # get the library's filename
+    if("${CORE_SYSTEM_NAME}" STREQUAL "android")
+      # for android we need the filename without any version numbers
+      set(LIBRARY_FILENAME $<TARGET_LINKER_FILE_NAME:${target}>)
+    else()
+      set(LIBRARY_FILENAME $<TARGET_FILE_NAME:${target}>)
+    endif()
+  endif()
+
+  # if there's an addon.xml.in we need to generate the addon.xml
+  if(EXISTS ${PROJECT_SOURCE_DIR}/${target}/addon.xml.in)
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/${target}/addon.xml.in)
+    set(PLATFORM ${CORE_SYSTEM_NAME})
+
+    file(READ ${PROJECT_SOURCE_DIR}/${target}/addon.xml.in addon_file)
+    string(CONFIGURE "${addon_file}" addon_file_conf @ONLY)
+    file(GENERATE OUTPUT ${PROJECT_SOURCE_DIR}/${target}/addon.xml CONTENT "${addon_file_conf}")
+    if(${APP_NAME_UC}_BUILD_DIR)
+      file(GENERATE OUTPUT ${${APP_NAME_UC}_BUILD_DIR}/addons/${target}/addon.xml CONTENT "${addon_file_conf}")
+    endif()
+  endif()
+
+  # if there's an settings.xml.in we need to generate the settings.xml
+  if(EXISTS ${PROJECT_SOURCE_DIR}/${target}/resources/settings.xml.in)
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/${target}/resources/settings.xml.in)
+    set(PLATFORM ${CORE_SYSTEM_NAME})
+
+    file(READ ${PROJECT_SOURCE_DIR}/${target}/resources/settings.xml.in settings_file)
+    string(CONFIGURE "${settings_file}" settings_file_conf @ONLY)
+    file(GENERATE OUTPUT ${PROJECT_SOURCE_DIR}/${target}/resources/settings.xml CONTENT "${settings_file_conf}")
+    if(${APP_NAME_UC}_BUILD_DIR)
+      file(GENERATE OUTPUT ${${APP_NAME_UC}_BUILD_DIR}/addons/${target}/resources/settings.xml CONTENT "${settings_file_conf}")
+    endif()
+  endif()
+
+  # set zip as default if addon-package is called without PACKAGE_XXX
+  set(CPACK_GENERATOR "ZIP")
+  set(ext "zip")
+  if(PACKAGE_ZIP OR PACKAGE_TGZ)
+    if(PACKAGE_TGZ)
+      set(CPACK_GENERATOR "TGZ")
+      set(ext "tar.gz")
+    endif()
+    set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
+    set(CPACK_PACKAGE_FILE_NAME addon)
+    if(CMAKE_BUILD_TYPE STREQUAL "Release")
+      set(CPACK_STRIP_FILES TRUE)
+    endif()
+    set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
+    set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
+    list(APPEND CPACK_COMPONENTS_ALL ${target}-${${prefix}_VERSION})
+    # Pack files together to create an archive
+    install(DIRECTORY ${target} DESTINATION ./ COMPONENT ${target}-${${prefix}_VERSION} PATTERN "xml.in" EXCLUDE)
+    if(WIN32)
+      if(NOT CPACK_PACKAGE_DIRECTORY)
+        # determine the temporary path
+        file(TO_CMAKE_PATH "$ENV{TEMP}" WIN32_TEMP_PATH)
+        string(LENGTH "${WIN32_TEMP_PATH}" WIN32_TEMP_PATH_LENGTH)
+        string(LENGTH "${PROJECT_BINARY_DIR}" PROJECT_BINARY_DIR_LENGTH)
+
+        # check if the temporary path is shorter than the default packaging directory path
+        if(WIN32_TEMP_PATH_LENGTH GREATER 0 AND WIN32_TEMP_PATH_LENGTH LESS PROJECT_BINARY_DIR_LENGTH)
+          # set the directory used by CPack for packaging to the temp directory
+          set(CPACK_PACKAGE_DIRECTORY ${WIN32_TEMP_PATH})
+        endif()
+      endif()
+
+      # in case of a VC++ project the installation location contains a $(Configuration) VS variable
+      # we replace it with ${CMAKE_BUILD_TYPE} (which doesn't cover the case when the build configuration
+      # is changed within Visual Studio)
+      string(REPLACE "$(Configuration)" "${CMAKE_BUILD_TYPE}" LIBRARY_LOCATION "${LIBRARY_LOCATION}")
+
+      if(${prefix}_SOURCES)
+        # install the generated DLL file
+        install(PROGRAMS ${LIBRARY_LOCATION} DESTINATION ${target}
+                COMPONENT ${target}-${${prefix}_VERSION})
+
+        if(CMAKE_BUILD_TYPE MATCHES Debug)
+          # for debug builds also install the PDB file
+          get_filename_component(LIBRARY_DIR ${LIBRARY_LOCATION} DIRECTORY)
+          install(FILES $<TARGET_PDB_FILE:${target}> DESTINATION ${target}
+                  COMPONENT ${target}-${${prefix}_VERSION})
+        endif()
+      endif()
+      if (${prefix}_CUSTOM_BINARY)
+        list(GET ${prefix}_CUSTOM_BINARY 0 FROM_BINARY)
+        list(GET ${prefix}_CUSTOM_BINARY 1 TO_BINARY)
+        install(FILES ${FROM_BINARY} DESTINATION ${target} RENAME ${TO_BINARY})
+      endif()
+      if(${prefix}_CUSTOM_DATA)
+        install(DIRECTORY ${${prefix}_CUSTOM_DATA} DESTINATION ${target}/resources)
+      endif()
+    else()
+      if(NOT CPACK_PACKAGE_DIRECTORY)
+        set(CPACK_PACKAGE_DIRECTORY ${CMAKE_BINARY_DIR})
+      endif()
+      if(${prefix}_SOURCES)
+        install(TARGETS ${target} DESTINATION ${target}
+                COMPONENT ${target}-${${prefix}_VERSION})
+      endif()
+      if (${prefix}_CUSTOM_BINARY)
+        list(GET ${prefix}_CUSTOM_BINARY 0 FROM_BINARY)
+        list(GET ${prefix}_CUSTOM_BINARY 1 TO_BINARY)
+        if(OS STREQUAL "android")
+          set(TO_BINARY "lib${TO_BINARY}")
+        endif()
+        install(FILES ${FROM_BINARY} DESTINATION ${target} RENAME ${TO_BINARY}
+                COMPONENT ${target}-${${prefix}_VERSION})
+      endif()
+      if(${prefix}_CUSTOM_DATA)
+        install(DIRECTORY ${${prefix}_CUSTOM_DATA} DESTINATION ${target}/resources)
+      endif()
+    endif()
+    add_cpack_workaround(${target} ${${prefix}_VERSION} ${ext})
+  else()
+    if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL rbpi OR CORE_SYSTEM_NAME STREQUAL freebsd)
+      if(NOT OVERRIDE_PATHS)
+        if(CMAKE_INSTALL_PREFIX AND NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT CMAKE_INSTALL_PREFIX STREQUAL "${${APP_NAME_UC}_PREFIX}")
+          message(WARNING "CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} differs from ${APP_NAME} prefix, changing to ${${APP_NAME_UC}_PREFIX}. Please pass -DOVERRIDE_PATHS=1 to skip this check")
+        endif()
+        if(CMAKE_INSTALL_LIBDIR AND NOT CMAKE_INSTALL_LIBDIR STREQUAL "${${APP_NAME_UC}_LIB_DIR}")
+          message(WARNING "CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR} differs from ${APP_NAME} libdir, changing to ${${APP_NAME_UC}_LIB_DIR}. Please pass -DOVERRIDE_PATHS=1 to skip this check")
+        endif()
+        if(CMAKE_INSTALL_DATADIR AND NOT CMAKE_INSTALL_DATADIR STREQUAL "${${APP_NAME_UC}_DATA_DIR}")
+          message(WARNING "CMAKE_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR} differs from ${APP_NAME} datadir, changing to ${${APP_NAME_UC}_DATA_DIR}. Please pass -DOVERRIDE_PATHS=1 to skip this check")
+        endif()
+        set(CMAKE_INSTALL_PREFIX "${${APP_NAME_UC}_PREFIX}" CACHE PATH "${APP_NAME} install prefix" FORCE)
+        set(CMAKE_INSTALL_LIBDIR "${${APP_NAME_UC}_LIB_DIR}" CACHE PATH "${APP_NAME} install libdir" FORCE)
+        set(CMAKE_INSTALL_DATADIR "${${APP_NAME_UC}_DATA_DIR}" CACHE PATH "${APP_NAME} install datadir" FORCE)
+      else()
+        if(NOT CMAKE_INSTALL_LIBDIR)
+          set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${APP_NAME_LC}")
+        endif()
+        if(NOT CMAKE_INSTALL_DATADIR)
+          set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/share/${APP_NAME_LC}")
+        endif()
+      endif()
+    else()
+      set(CMAKE_INSTALL_LIBDIR "lib/${APP_NAME_LC}")
+      set(CMAKE_INSTALL_DATADIR "share/${APP_NAME_LC}")
+    endif()
+    if(${prefix}_SOURCES)
+      install(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target})
+    endif()
+    if (${prefix}_CUSTOM_BINARY)
+      list(GET ${prefix}_CUSTOM_BINARY 0 FROM_BINARY)
+      list(GET ${prefix}_CUSTOM_BINARY 1 TO_BINARY)
+      if(OS STREQUAL "android")
+        set(TO_BINARY "lib${TO_BINARY}")
+      endif()
+      install(FILES ${FROM_BINARY} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target} RENAME ${TO_BINARY})
+    endif()
+    install(DIRECTORY ${target} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons PATTERN "xml.in" EXCLUDE)
+    if(${prefix}_CUSTOM_DATA)
+      install(DIRECTORY ${${prefix}_CUSTOM_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons/${target}/resources)
+    endif()
+  endif()
+  if(${APP_NAME_UC}_BUILD_DIR)
+    file(GLOB_RECURSE files ${CMAKE_CURRENT_SOURCE_DIR}/${target}/*)
+    if(${prefix}_CUSTOM_DATA)
+      add_custom_command(TARGET ${target} POST_BUILD
+                         COMMAND ${CMAKE_COMMAND} -E copy_directory
+                                 ${${prefix}_CUSTOM_DATA}
+                                 ${${APP_NAME_UC}_BUILD_DIR}/addons/${target}/resources)
+    endif()
+    foreach(file ${files})
+      string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/${target}/" "" name "${file}")
+      # A good way to deal with () in filenames
+      if(NOT ${file} MATCHES xml.in)
+        configure_file(${file} ${${APP_NAME_UC}_BUILD_DIR}/addons/${target}/${name} COPYONLY)
+      endif()
+    endforeach()
+    add_custom_command(TARGET ${target} POST_BUILD
+                       COMMAND ${CMAKE_COMMAND} -E copy
+                                   ${LIBRARY_LOCATION}
+                                   ${${APP_NAME_UC}_BUILD_DIR}/addons/${target}/${LIBRARY_FILENAME})
+  endif()
+endmacro()
+
+# finds a path to a given file (recursive)
+function (kodi_find_path var_name filename search_path strip_file)
+  file(GLOB_RECURSE PATH_TO_FILE ${search_path} ${filename})
+  if(strip_file)
+    string(REPLACE ${filename} "" PATH_TO_FILE ${PATH_TO_FILE})
+  endif()
+  set (${var_name} ${PATH_TO_FILE} PARENT_SCOPE)
+endfunction()
+
+# Cmake build options
+include(AddOptions)
+include(TestCXXAcceptsFlag)
+option(PACKAGE_ZIP "Package Zip file?" OFF)
+option(PACKAGE_TGZ "Package TGZ file?" OFF)
+option(BUILD_SHARED_LIBS "Build shared libs?" ON)
+
+# LTO support?
+CHECK_CXX_ACCEPTS_FLAG("-flto" HAVE_LTO)
+if(HAVE_LTO)
+  option(USE_LTO "use link time optimization" OFF)
+  if(USE_LTO)
+    add_options(ALL_LANGUAGES ALL_BUILDS "-flto")
+  endif()
+endif() 
+
+# set this to try linking dependencies as static as possible
+if(ADDONS_PREFER_STATIC_LIBS)
+  set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+endif()
+
+if(${APP_NAME_UC}_BUILD_DIR)
+  list(APPEND CMAKE_PREFIX_PATH ${${APP_NAME_UC}_BUILD_DIR}/build)
+endif()
diff --git a/project/cmake/scripts/common/archsetup.cmake b/project/cmake/scripts/common/ArchSetup.cmake
index dff5558..438e3bd 100644
--- a/project/cmake/scripts/common/archsetup.cmake
+++ b/project/cmake/scripts/common/ArchSetup.cmake
@@ -71,15 +71,33 @@ if(CMAKE_TOOLCHAIN_FILE)
   endif()
 endif()
 
+# While CMAKE_CROSSCOMPILING is set unconditionally if there's a toolchain file,
+# this variable is set if we can execute build artefacts on the host system (for example unit tests).
+if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR AND
+   CMAKE_HOST_SYSTEM_NAME STREQUAL CMAKE_SYSTEM_NAME)
+  set(CORE_HOST_IS_TARGET TRUE)
+else()
+  set(CORE_HOST_IS_TARGET FALSE)
+endif()
+
 # Main cpp
 set(CORE_MAIN_SOURCE ${CORE_SOURCE_DIR}/xbmc/platform/posix/main.cpp)
 
 # system specific arch setup
-include(${PROJECT_SOURCE_DIR}/scripts/${CORE_SYSTEM_NAME}/archsetup.cmake)
+if(NOT EXISTS ${PROJECT_SOURCE_DIR}/scripts/${CORE_SYSTEM_NAME}/ArchSetup.cmake)
+  message(FATAL_ERROR "Couldn't find configuration for '${CORE_SYSTEM_NAME}' "
+                      "Either the platform is not (yet) supported "
+                      "or a toolchain file has to be specified. "
+                      "Consult ${CMAKE_SOURCE_DIR}/README.md for instructions. "
+                      "Note: Specifying a toolchain requires a clean build directory!")
+endif()
+include(${PROJECT_SOURCE_DIR}/scripts/${CORE_SYSTEM_NAME}/ArchSetup.cmake)
 
 message(STATUS "Core system type: ${CORE_SYSTEM_NAME}")
 message(STATUS "Platform: ${PLATFORM}")
 message(STATUS "CPU: ${CPU}, ARCH: ${ARCH}")
+message(STATUS "Cross-Compiling: ${CMAKE_CROSSCOMPILING}")
+message(STATUS "Execute build artefacts on host: ${CORE_HOST_IS_TARGET}")
 
 check_type(string std::u16string HAVE_STD__U16_STRING)
 check_type(string std::u32string HAVE_STD__U32_STRING)
@@ -87,6 +105,7 @@ check_type(string char16_t HAVE_CHAR16_T)
 check_type(string char32_t HAVE_CHAR32_T)
 check_type(stdint.h uint_least16_t HAVE_STDINT_H)
 check_symbol_exists(posix_fadvise fcntl.h HAVE_POSIX_FADVISE)
+check_symbol_exists(PRIdMAX inttypes.h HAVE_INTTYPES_H)
 check_builtin("long* temp=0; long ret=__sync_add_and_fetch(temp, 1)" HAS_BUILTIN_SYNC_ADD_AND_FETCH)
 check_builtin("long* temp=0; long ret=__sync_sub_and_fetch(temp, 1)" HAS_BUILTIN_SYNC_SUB_AND_FETCH)
 check_builtin("long* temp=0; long ret=__sync_val_compare_and_swap(temp, 1, 1)" HAS_BUILTIN_SYNC_VAL_COMPARE_AND_SWAP)
@@ -97,3 +116,35 @@ check_function_exists(localtime_r HAVE_LOCALTIME_R)
 if(HAVE_LOCALTIME_R)
   list(APPEND SYSTEM_DEFINES -DHAVE_LOCALTIME_R=1)
 endif()
+if(HAVE_INTTYPES_H)
+  list(APPEND SYSTEM_DEFINES -DHAVE_INTTYPES_H=1)
+endif()
+
+find_package(SSE)
+foreach(_sse SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2)
+  if(${${_sse}_FOUND})
+    # enable SSE versions up to 4.1 by default, if available
+    if(NOT ${_sse} MATCHES "AVX" AND NOT ${_sse} STREQUAL "SSE4_2")
+      option(ENABLE_${_sse} "Enable ${_sse}" ON)
+    else()
+      option(ENABLE_${_sse} "Enable ${_sse}" OFF)
+    endif()
+  endif()
+  if(ENABLE_${_sse})
+    set(HAVE_${_sse} TRUE CACHE STRING "${_sse} enabled")
+    list(APPEND ARCH_DEFINES -DHAVE_${_sse}=1)
+  endif()
+endforeach()
+
+if(NOT DEFINED NEON OR NEON)
+  option(ENABLE_NEON "Enable NEON optimization" ${NEON})
+  if(ENABLE_NEON)
+    message(STATUS "NEON optimization enabled")
+    add_options(CXX ALL_BUILDS "-mfpu=neon -mvectorize-with-neon-quad")
+  endif()
+endif()
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  add_options (ALL_LANGUAGES DEBUG "-g" "-D_DEBUG" "-Wall")
+endif()
+
diff --git a/project/cmake/scripts/common/CMakeHelpers.cmake b/project/cmake/scripts/common/CMakeHelpers.cmake
new file mode 100644
index 0000000..995c38a
--- /dev/null
+++ b/project/cmake/scripts/common/CMakeHelpers.cmake
@@ -0,0 +1,54 @@
+# This file contains functions that support the debugging of the CMake files.
+
+# This file shouldn't be included per default in any CMake file. It should be
+# included and used only on demand. All functions are prefixed with "debug_".
+#
+# Usage:
+# include(scripts/common/CMakeHelpers.cmake)
+# debug_print_variables()
+
+# Print all CMake variables.
+macro(debug_print_variables)
+  get_cmake_property(_variableNames VARIABLES)
+  foreach(_variableName ${_variableNames})
+    message(STATUS "${_variableName} = ${${_variableName}}")
+  endforeach()
+endmacro()
+
+# Get all properties that CMake supports and convert them to a list.
+function(debug_get_properties VAR)
+  execute_process(COMMAND cmake --help-property-list
+                  OUTPUT_VARIABLE _properties)
+  string(REGEX REPLACE ";" "\\\\;" _properties "${_properties}")
+  string(REGEX REPLACE "\n" ";" _properties "${_properties}")
+  list(REMOVE_DUPLICATES _properties)
+  list(REMOVE_ITEM _properties LOCATION)
+  set(${VAR} ${_properties} PARENT_SCOPE)
+endfunction()
+
+# List all properties.
+function(debug_list_properties)
+  debug_get_properties(_properties)
+  message("CMake properties = ${_properties}")
+endfunction()
+
+# Print all set properties of a specified target.
+function(debug_print_target_properties target)
+  if(NOT TARGET ${target})
+    message(FATAL_ERROR "There is no target named '${target}'")
+  endif()
+
+  debug_get_properties(_properties)
+
+  # Reading LOCATION property is deprecated and triggers a fatal error.
+  string(REGEX REPLACE ";LOCATION;|LOCATION" "" _properties "${_properties}")
+  string(REGEX REPLACE "<CONFIG>" "${CMAKE_BUILD_TYPE}" _properties
+         "${_properties}")
+  foreach(_property ${_properties})
+    get_property(_value TARGET ${target} PROPERTY ${_property} SET)
+    if(_value)
+      get_target_property(_value ${target} ${_property})
+      message("${target} ${_property} = ${_value}")
+    endif()
+  endforeach()
+endfunction()
diff --git a/project/cmake/scripts/common/checkcommits.cmake b/project/cmake/scripts/common/CheckCommits.cmake
index 304e623..304e623 100644
--- a/project/cmake/scripts/common/checkcommits.cmake
+++ b/project/cmake/scripts/common/CheckCommits.cmake
diff --git a/project/cmake/scripts/common/check_target_platform.cmake b/project/cmake/scripts/common/CheckTargetPlatform.cmake
index fc8b403..5b5d9a1 100644
--- a/project/cmake/scripts/common/check_target_platform.cmake
+++ b/project/cmake/scripts/common/CheckTargetPlatform.cmake
@@ -9,7 +9,7 @@ function(check_target_platform dir target_platform build)
   if(EXISTS ${dir} AND EXISTS ${dir}/platforms.txt)
     # get all the specified platforms
     file(STRINGS ${dir}/platforms.txt platforms)
-    separate_arguments(platforms)
+    string(REPLACE " " ";" platforms ${platforms})
 
     # check if the addon/dependency should be built for the current platform
     foreach(platform ${platforms})
@@ -21,11 +21,11 @@ function(check_target_platform dir target_platform build)
         if(${platform_first} STREQUAL "!")
           # extract the platform
           string(LENGTH ${platform} platform_length)
-          MATH(EXPR platform_length "${platform_length} - 1")
+          math(EXPR platform_length "${platform_length} - 1")
           string(SUBSTRING ${platform} 1 ${platform_length} platform)
 
           # check if the current platform does not match the extracted platform
-          if (NOT ${platform} STREQUAL ${target_platform})
+          if(NOT ${platform} STREQUAL ${target_platform})
             set(${build} TRUE)
           endif()
         endif()
@@ -43,19 +43,21 @@ function(check_install_permissions install_dir have_perms)
   # param[in] install_dir directory to check for write permissions
   # param[out] have_perms wether we have permissions to install to install_dir
 
-  set(${have_perms} TRUE)
-  execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${install_dir}/lib/kodi
-                  COMMAND ${CMAKE_COMMAND} -E make_directory ${install_dir}/share/kodi
-                  COMMAND ${CMAKE_COMMAND} -E touch ${install_dir}/lib/kodi/.cmake-inst-test ${install_dir}/share/kodi/.cmake-inst-test
-                  RESULT_VARIABLE permtest)
+  set(testfile_lib ${install_dir}/lib/kodi/.cmake-inst-test)
+  set(testfile_share ${install_dir}/share/kodi/.cmake-inst-test)
+  get_filename_component(testdir_lib ${testfile_lib} DIRECTORY)
+  get_filename_component(testdir_share ${testfile_share} DIRECTORY)
 
-  if(${permtest} GREATER 0)
-    message(STATUS "check_install_permissions: ${permtest}")
-    set(${have_perms} FALSE)
-  endif()
-  set(${have_perms} "${${have_perms}}" PARENT_SCOPE)
+  execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${testdir_lib})
+  execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${testdir_share})
+  execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${testfile_lib})
+  execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${testfile_share})
 
-  if(EXISTS ${install_dir}/lib/kodi/.cmake-inst-test OR EXISTS ${install_dir}/share/kodi/.cmake-inst-test)
-    file(REMOVE ${install_dir}/lib/kodi/.cmake-inst-test ${install_dir}/share/kodi/.cmake-inst-test)
+  if(EXISTS ${testfile_lib} AND EXISTS ${testfile_share})
+    set(${have_perms} True PARENT_SCOPE)
+  else()
+    message(STATUS "check_install_permissions ${install_dir}: failed to create files")
+    set(${have_perms} False PARENT_SCOPE)
   endif()
+  file(REMOVE ${testfile_lib} ${testfile_share})
 endfunction()
diff --git a/project/cmake/scripts/common/GenerateVersionedFiles.cmake b/project/cmake/scripts/common/GenerateVersionedFiles.cmake
new file mode 100644
index 0000000..e105b27
--- /dev/null
+++ b/project/cmake/scripts/common/GenerateVersionedFiles.cmake
@@ -0,0 +1,18 @@
+include(${CORE_SOURCE_DIR}/project/cmake/scripts/common/Macros.cmake)
+
+core_find_versions()
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/addons/xbmc.addon)
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/addons/kodi.guilib)
+
+# configure_file without dependency tracking
+# configure_file would register additional file dependencies that interfere
+# with the ones from add_custom_command (and the generation would happen twice)
+function(generate_versioned_file _SRC _DEST)
+  file(READ ${CORE_SOURCE_DIR}/${_SRC} file_content)
+  string(CONFIGURE "${file_content}" file_content @ONLY)
+  file(WRITE ${CMAKE_BINARY_DIR}/${_DEST} "${file_content}")
+endfunction()
+
+generate_versioned_file(addons/xbmc.addon/addon.xml.in addons/xbmc.addon/addon.xml)
+generate_versioned_file(addons/kodi.guilib/addon.xml.in addons/kodi.guilib/addon.xml)
+generate_versioned_file(xbmc/CompileInfo.cpp.in ${CORE_BUILD_DIR}/xbmc/CompileInfo.cpp)
diff --git a/project/cmake/scripts/common/generatorsetup.cmake b/project/cmake/scripts/common/GeneratorSetup.cmake
index 75083ca..304b504 100644
--- a/project/cmake/scripts/common/generatorsetup.cmake
+++ b/project/cmake/scripts/common/GeneratorSetup.cmake
@@ -22,3 +22,28 @@ else()
   set(CORE_BUILD_CONFIG ${CMAKE_BUILD_TYPE})
   message(STATUS "Generator: Single-configuration: ${CMAKE_BUILD_TYPE} (${CMAKE_GENERATOR})")
 endif()
+
+# Print CMake version
+message(STATUS "CMake Version: ${CMAKE_VERSION}")
+
+# Deal with CMake special cases
+if(CMAKE_VERSION VERSION_EQUAL 3.5.1)
+  message(WARNING "CMake 3.5.1 introduced a crash during configuration. "
+                  "Please consider upgrading to 3.5.2 (cmake.org/Bug/view.php?id=16044)")
+endif()
+
+# Darwin needs CMake 3.4
+if(APPLE AND CMAKE_VERSION VERSION_LESS 3.4)
+  message(WARNING "Build on Darwin requires CMake 3.4 or later (tdb library support) "
+                  "or the usage of the patched version in depends.")
+endif()
+
+# Windows needs CMake 3.6 (VS_STARTUP_PROJECT)
+if(WIN32 AND CMAKE_VERSION VERSION_LESS 3.6)
+  message(FATAL_ERROR "Build on Windows needs CMake 3.6 or later")
+endif()
+
+# Ninja needs CMake 3.2 due to ExternalProject BUILD_BYPRODUCTS usage
+if(CMAKE_GENERATOR STREQUAL Ninja AND CMAKE_VERSION VERSION_LESS 3.2)
+  message(FATAL_ERROR "Generator: Ninja requires CMake 3.2 or later")
+endif()
diff --git a/project/cmake/scripts/common/handle-depends.cmake b/project/cmake/scripts/common/HandleDepends.cmake
index 4d78928..880ccdf 100644
--- a/project/cmake/scripts/common/handle-depends.cmake
+++ b/project/cmake/scripts/common/HandleDepends.cmake
@@ -1,15 +1,17 @@
-include(${APP_ROOT}/project/cmake/scripts/common/check_target_platform.cmake)
+include(${CORE_SOURCE_DIR}/project/cmake/scripts/common/CheckTargetPlatform.cmake)
 
 # handle addon depends
 function(add_addon_depends addon searchpath)
   # input: string addon string searchpath
 
-  set(OUTPUT_DIR ${DEPENDS_PATH})
+  set(OUTPUT_DIR ${ADDON_DEPENDS_PATH})
+  # look for platform-specific dependencies
   file(GLOB_RECURSE cmake_input_files ${searchpath}/${CORE_SYSTEM_NAME}/*.txt)
   file(GLOB_RECURSE cmake_input_files2 ${searchpath}/common/*.txt)
   list(APPEND cmake_input_files ${cmake_input_files2})
 
   foreach(file ${cmake_input_files})
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${file})
     if(NOT (file MATCHES CMakeLists.txt OR
             file MATCHES install.txt OR
             file MATCHES noinstall.txt OR
@@ -18,9 +20,9 @@ function(add_addon_depends addon searchpath)
             file MATCHES platforms.txt))
       message(STATUS "Processing ${file}")
       file(STRINGS ${file} def)
-      separate_arguments(def)
+      string(REPLACE " " ";" def ${def})
       list(LENGTH def deflength)
-      get_filename_component(dir ${file} PATH)
+      get_filename_component(dir ${file} DIRECTORY)
 
       # get the id of the dependency
       if(NOT "${def}" STREQUAL "")
@@ -45,8 +47,9 @@ function(add_addon_depends addon searchpath)
 
         # check if there are any library specific flags that need to be passed on
         if(EXISTS ${dir}/flags.txt)
+          set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/flags.txt)
           file(STRINGS ${dir}/flags.txt extraflags)
-          separate_arguments(extraflags)
+          string(REPLACE " " ";" extraflags ${extraflags})
           message(STATUS "${id} extraflags: ${extraflags}")
         endif()
 
@@ -70,16 +73,20 @@ function(add_addon_depends addon searchpath)
 
         if(CMAKE_TOOLCHAIN_FILE)
           list(APPEND BUILD_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
-          MESSAGE("toolchain specified")
-          MESSAGE(${BUILD_ARGS})
+          message("toolchain specified")
+          message(${BUILD_ARGS})
         endif()
 
-        # if there's a CMakeLists.txt use it to prepare the build
+        # prepare patchfile. ensure we have a clean file after reconfiguring
         set(PATCH_FILE ${BUILD_DIR}/${id}/tmp/patch.cmake)
+        file(REMOVE ${PATCH_FILE})
+
+        # if there's a CMakeLists.txt use it to prepare the build
         if(EXISTS ${dir}/CMakeLists.txt)
+          set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/CMakeLists.txt)
           file(APPEND ${PATCH_FILE}
                "file(COPY ${dir}/CMakeLists.txt
-                   DESTINATION ${BUILD_DIR}/${id}/src/${id})\n")
+                     DESTINATION ${BUILD_DIR}/${id}/src/${id})\n")
         endif()
 
         # check if we have patches to apply
@@ -104,6 +111,7 @@ function(add_addon_depends addon searchpath)
             endif()
           endif()
 
+          set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${patch})
           file(APPEND ${PATCH_FILE}
                "execute_process(COMMAND ${PATCH_PROGRAM} -p1 -i \"${patch}\")\n")
         endforeach()
@@ -125,6 +133,7 @@ function(add_addon_depends addon searchpath)
 
         # check if there's a deps.txt containing dependencies on other libraries
         if(EXISTS ${dir}/deps.txt)
+          set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/deps.txt)
           file(STRINGS ${dir}/deps.txt deps)
           message(STATUS "${id} depends: ${deps}")
         else()
@@ -133,6 +142,7 @@ function(add_addon_depends addon searchpath)
 
         if(CROSS_AUTOCONF AND AUTOCONF_FILES)
           foreach(afile ${AUTOCONF_FILES})
+            set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${afile})
             file(APPEND ${PATCH_FILE}
                  "message(STATUS \"AUTOCONF: copying ${afile} to ${BUILD_DIR}/${id}/src/${id}\")\n
                  file(COPY ${afile} DESTINATION ${BUILD_DIR}/${id}/src/${id})\n")
@@ -141,7 +151,7 @@ function(add_addon_depends addon searchpath)
 
         # if the patch file exists we need to set the PATCH_COMMAND
         set(PATCH_COMMAND "")
-        if (EXISTS ${PATCH_FILE})
+        if(EXISTS ${PATCH_FILE})
           set(PATCH_COMMAND ${CMAKE_COMMAND} -P ${PATCH_FILE})
         endif()
 
diff --git a/project/cmake/scripts/common/Macros.cmake b/project/cmake/scripts/common/Macros.cmake
new file mode 100644
index 0000000..71c39ef
--- /dev/null
+++ b/project/cmake/scripts/common/Macros.cmake
@@ -0,0 +1,619 @@
+# This script holds the main functions used to construct the build system
+
+# include system specific macros
+include(${CORE_SOURCE_DIR}/project/cmake/scripts/${CORE_SYSTEM_NAME}/Macros.cmake)
+
+# IDEs: Group source files in target in folders (file system hierarchy)
+# Source: http://blog.audio-tk.com/2015/09/01/sorting-source-files-and-projects-in-folders-with-cmake-and-visual-studioxcode/
+# Arguments:
+#   target The target that shall be grouped by folders.
+# Optional Arguments:
+#   RELATIVE allows to specify a different reference folder.
+function(source_group_by_folder target)
+  if(NOT TARGET ${target})
+    message(FATAL_ERROR "There is no target named '${target}'")
+  endif()
+
+  set(SOURCE_GROUP_DELIMITER "/")
+
+  cmake_parse_arguments(arg "" "RELATIVE" "" ${ARGN})
+  if(arg_RELATIVE)
+    set(relative_dir ${arg_RELATIVE})
+  else()
+    set(relative_dir ${CMAKE_CURRENT_SOURCE_DIR})
+  endif()
+
+  get_property(files TARGET ${target} PROPERTY SOURCES)
+  if(files)
+    list(SORT files)
+
+    if(CMAKE_GENERATOR STREQUAL Xcode)
+      set_target_properties(${target} PROPERTIES SOURCES "${files}")
+    endif()
+  endif()
+  foreach(file ${files})
+    if(NOT IS_ABSOLUTE ${file})
+      set(file ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+    endif()
+    file(RELATIVE_PATH relative_file ${relative_dir} ${file})
+    get_filename_component(dir "${relative_file}" DIRECTORY)
+    if(NOT dir STREQUAL "${last_dir}")
+      if(files)
+        source_group("${last_dir}" FILES ${files})
+      endif()
+      set(files "")
+    endif()
+    set(files ${files} ${file})
+    set(last_dir "${dir}")
+  endforeach(file)
+  if(files)
+    source_group("${last_dir}" FILES ${files})
+  endif()
+endfunction()
+
+# Add sources to main application
+# Arguments:
+#   name name of the library to add
+# Implicit arguments:
+#   ENABLE_STATIC_LIBS Build static libraries per directory
+#   SOURCES the sources of the library
+#   HEADERS the headers of the library (only for IDE support)
+#   OTHERS  other library related files (only for IDE support)
+# On return:
+#   Library will be built, optionally added to ${core_DEPENDS}
+#   Sets CORE_LIBRARY for calls for setting target specific options
+function(core_add_library name)
+  if(ENABLE_STATIC_LIBS)
+    add_library(${name} STATIC ${SOURCES} ${HEADERS} ${OTHERS})
+    set_target_properties(${name} PROPERTIES PREFIX "")
+    set(core_DEPENDS ${name} ${core_DEPENDS} CACHE STRING "" FORCE)
+    add_dependencies(${name} libcpluff ffmpeg dvdnav crossguid)
+    set(CORE_LIBRARY ${name} PARENT_SCOPE)
+
+    # Add precompiled headers to Kodi main libraries
+    if(CORE_SYSTEM_NAME STREQUAL windows)
+      add_precompiled_header(${name} pch.h ${CORE_SOURCE_DIR}/xbmc/platform/win32/pch.cpp PCH_TARGET kodi)
+      set_language_cxx(${name})
+      target_link_libraries(${name} PUBLIC effects11)
+    endif()
+  else()
+    foreach(src IN LISTS SOURCES HEADERS OTHERS)
+      get_filename_component(src_path "${src}" ABSOLUTE)
+      list(APPEND FILES ${src_path})
+    endforeach()
+    target_sources(lib${APP_NAME_LC} PRIVATE ${FILES})
+    set(CORE_LIBRARY lib${APP_NAME_LC} PARENT_SCOPE)
+  endif()
+endfunction()
+
+# Add a test library, and add sources to list for gtest integration macros
+function(core_add_test_library name)
+  if(ENABLE_STATIC_LIBS)
+    add_library(${name} STATIC ${SOURCES} ${SUPPORTED_SOURCES} ${HEADERS} ${OTHERS})
+    set_target_properties(${name} PROPERTIES PREFIX ""
+                                             EXCLUDE_FROM_ALL 1
+                                             FOLDER "Build Utilities/tests")
+    add_dependencies(${name} libcpluff ffmpeg dvdnav crossguid)
+    set(test_archives ${test_archives} ${name} CACHE STRING "" FORCE)
+  endif()
+  foreach(src IN LISTS SOURCES)
+    get_filename_component(src_path "${src}" ABSOLUTE)
+    set(test_sources "${src_path}" ${test_sources} CACHE STRING "" FORCE)
+  endforeach()
+endfunction()
+
+# Add an addon callback library
+# Arguments:
+#   name name of the library to add
+# Implicit arguments:
+#   SOURCES the sources of the library
+#   HEADERS the headers of the library (only for IDE support)
+#   OTHERS  other library related files (only for IDE support)
+# On return:
+#   Library target is defined and added to LIBRARY_FILES
+function(core_add_addon_library name)
+  get_filename_component(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+  list(APPEND SOURCES lib${name}.cpp)
+  core_add_shared_library(${name} OUTPUT_DIRECTORY addons/${DIRECTORY})
+  set_target_properties(${name} PROPERTIES FOLDER addons)
+  target_include_directories(${name} PRIVATE
+                             ${CMAKE_CURRENT_SOURCE_DIR}
+                             ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi
+                             ${CORE_SOURCE_DIR}/xbmc)
+endfunction()
+
+# Add an dl-loaded shared library
+# Arguments:
+#   name name of the library to add
+# Optional arguments:
+#   WRAPPED wrap this library on POSIX platforms to add VFS support for
+#           libraries that would otherwise not support it.
+#   OUTPUT_DIRECTORY where to create the library in the build dir
+#           (default: system)
+# Implicit arguments:
+#   SOURCES the sources of the library
+#   HEADERS the headers of the library (only for IDE support)
+#   OTHERS  other library related files (only for IDE support)
+# On return:
+#   Library target is defined and added to LIBRARY_FILES
+function(core_add_shared_library name)
+  cmake_parse_arguments(arg "WRAPPED" "OUTPUT_DIRECTORY" "" ${ARGN})
+  if(arg_OUTPUT_DIRECTORY)
+    set(OUTPUT_DIRECTORY ${arg_OUTPUT_DIRECTORY})
+  else()
+    if(NOT CORE_SYSTEM_NAME STREQUAL windows)
+      set(OUTPUT_DIRECTORY system)
+    endif()
+  endif()
+  if(CORE_SYSTEM_NAME STREQUAL windows)
+    set(OUTPUT_NAME lib${name})
+  else()
+    set(OUTPUT_NAME lib${name}-${ARCH})
+  endif()
+
+  if(NOT arg_WRAPPED OR CORE_SYSTEM_NAME STREQUAL windows)
+    add_library(${name} SHARED ${SOURCES} ${HEADERS} ${OTHERS})
+    set_target_properties(${name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${OUTPUT_DIRECTORY}
+                                             RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${OUTPUT_DIRECTORY}
+                                             RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/${OUTPUT_DIRECTORY}
+                                             RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${OUTPUT_DIRECTORY}
+                                             OUTPUT_NAME ${OUTPUT_NAME} PREFIX "")
+
+    set(LIBRARY_FILES ${LIBRARY_FILES} ${CMAKE_BINARY_DIR}/${OUTPUT_DIRECTORY}/${OUTPUT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} CACHE STRING "" FORCE)
+    add_dependencies(${APP_NAME_LC}-libraries ${name})
+  else()
+    add_library(${name} STATIC ${SOURCES} ${HEADERS} ${OTHERS})
+    set_target_properties(${name} PROPERTIES POSITION_INDEPENDENT_CODE 1)
+    core_link_library(${name} ${OUTPUT_DIRECTORY}/lib${name})
+  endif()
+endfunction()
+
+# Sets the compile language for all C source files in a target to CXX.
+# Needs to be called from the CMakeLists.txt that defines the target.
+# Arguments:
+#   target   target
+function(set_language_cxx target)
+  get_property(sources TARGET ${target} PROPERTY SOURCES)
+  foreach(file IN LISTS sources)
+    if(file MATCHES "\.c$")
+      set_source_files_properties(${file} PROPERTIES LANGUAGE CXX)
+    endif()
+  endforeach()
+endfunction()
+
+# Add a data file to installation list with a mirror in build tree
+# Mirroring files in the buildtree allows to execute the app from there.
+# Arguments:
+#   file        full path to file to mirror
+# Optional Arguments:
+#   NO_INSTALL: exclude file from installation target (only mirror)
+#   DIRECTORY:  directory where the file should be mirrored to
+#               (default: preserve tree structure relative to CORE_SOURCE_DIR)
+# On return:
+#   Files is mirrored to the build tree and added to ${install_data}
+#   (if NO_INSTALL is not given).
+function(copy_file_to_buildtree file)
+  cmake_parse_arguments(arg "NO_INSTALL" "DIRECTORY" "" ${ARGN})
+  if(arg_DIRECTORY)
+    set(outdir ${arg_DIRECTORY})
+    get_filename_component(outfile ${file} NAME)
+    set(outfile ${outdir}/${outfile})
+  else()
+    string(REPLACE "${CORE_SOURCE_DIR}/" "" outfile ${file})
+    get_filename_component(outdir ${outfile} DIRECTORY)
+  endif()
+
+  if(NOT TARGET export-files)
+    file(REMOVE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ExportFiles.cmake)
+    add_custom_target(export-files ALL COMMENT "Copying files into build tree"
+                      COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ExportFiles.cmake)
+    set_target_properties(export-files PROPERTIES FOLDER "Build Utilities")
+    file(APPEND ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ExportFiles.cmake "# Export files to build tree\n")
+  endif()
+
+  # Exclude autotools build artefacts and other blacklisted files in source tree.
+  if(file MATCHES "(Makefile|\.in|\.xbt|\.so|\.dylib|\.gitignore)$")
+    if(VERBOSE)
+      message(STATUS "copy_file_to_buildtree - ignoring file: ${file}")
+    endif()
+    return()
+  endif()
+
+  if(NOT file STREQUAL ${CMAKE_BINARY_DIR}/${outfile})
+    if(VERBOSE)
+      message(STATUS "copy_file_to_buildtree - copying file: ${file} -> ${CMAKE_BINARY_DIR}/${outfile}")
+    endif()
+    file(APPEND ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ExportFiles.cmake
+         "file(COPY \"${file}\" DESTINATION \"${CMAKE_BINARY_DIR}/${outdir}\")\n")
+  endif()
+
+  if(NOT arg_NO_INSTALL)
+    list(APPEND install_data ${outfile})
+    set(install_data ${install_data} PARENT_SCOPE)
+  endif()
+endfunction()
+
+# Add data files to installation list with a mirror in build tree.
+# reads list of files to install from a given list of text files.
+# Arguments:
+#   pattern globbing pattern for text files to read
+# Optional Arguments:
+#   NO_INSTALL: exclude files from installation target
+# Implicit arguments:
+#   CORE_SOURCE_DIR - root of source tree
+# On return:
+#   Files are mirrored to the build tree and added to ${install_data}
+#   (if NO_INSTALL is not given).
+function(copy_files_from_filelist_to_buildtree pattern)
+  # copies files listed in text files to the buildtree
+  # Input: [glob pattern: filepattern]
+  cmake_parse_arguments(arg "NO_INSTALL" "" "" ${ARGN})
+  list(APPEND pattern ${ARGN})
+  list(SORT pattern)
+  if(VERBOSE)
+    message(STATUS "copy_files_from_filelist_to_buildtree - got pattern: ${pattern}")
+  endif()
+  foreach(pat ${pattern})
+    file(GLOB filenames ${pat})
+    foreach(filename ${filenames})
+      string(STRIP ${filename} filename)
+      core_file_read_filtered(fstrings ${filename})
+      foreach(dir ${fstrings})
+        string(REPLACE " " ";" dir ${dir})
+        list(GET dir 0 src)
+        list(LENGTH dir len)
+        if(len EQUAL 1)
+          set(dest)
+        else()
+          list(GET dir -1 dest)
+        endif()
+
+        # If the full path to an existing file is specified then add that single file.
+        # Don't recursively add all files with the given name.
+        if(EXISTS ${CORE_SOURCE_DIR}/${src} AND NOT IS_DIRECTORY ${CORE_SOURCE_DIR}/${src})
+          set(files ${src})
+        else()
+          file(GLOB_RECURSE files RELATIVE ${CORE_SOURCE_DIR} ${CORE_SOURCE_DIR}/${src})
+        endif()
+
+        foreach(file ${files})
+          if(arg_NO_INSTALL)
+            copy_file_to_buildtree(${CORE_SOURCE_DIR}/${file} DIRECTORY ${dest} NO_INSTALL)
+          else()
+            copy_file_to_buildtree(${CORE_SOURCE_DIR}/${file} DIRECTORY ${dest})
+          endif()
+        endforeach()
+      endforeach()
+    endforeach()
+  endforeach()
+  set(install_data ${install_data} PARENT_SCOPE)
+endfunction()
+
+# helper macro to set modified variables in parent scope
+macro(export_dep)
+  set(SYSTEM_INCLUDES ${SYSTEM_INCLUDES} PARENT_SCOPE)
+  set(DEPLIBS ${DEPLIBS} PARENT_SCOPE)
+  set(DEP_DEFINES ${DEP_DEFINES} PARENT_SCOPE)
+  set(${depup}_FOUND ${${depup}_FOUND} PARENT_SCOPE)
+  mark_as_advanced(${depup}_LIBRARIES)
+endmacro()
+
+# add a required dependency of main application
+# Arguments:
+#   dep name of find rule for dependency, used uppercased for variable prefix
+# On return:
+#   dependency added to ${SYSTEM_INCLUDES}, ${DEPLIBS} and ${DEP_DEFINES}
+function(core_require_dep dep)
+  find_package(${dep} REQUIRED)
+  string(TOUPPER ${dep} depup)
+  list(APPEND SYSTEM_INCLUDES ${${depup}_INCLUDE_DIRS})
+  list(APPEND DEPLIBS ${${depup}_LIBRARIES})
+  list(APPEND DEP_DEFINES ${${depup}_DEFINITIONS})
+  export_dep()
+endfunction()
+
+# add a required dyloaded dependency of main application
+# Arguments:
+#   dep name of find rule for dependency, used uppercased for variable prefix
+# On return:
+#   dependency added to ${SYSTEM_INCLUDES}, ${dep}_SONAME is set up
+function(core_require_dyload_dep dep)
+  find_package(${dep} REQUIRED)
+  string(TOUPPER ${dep} depup)
+  list(APPEND SYSTEM_INCLUDES ${${depup}_INCLUDE_DIRS})
+  list(APPEND DEP_DEFINES ${${depup}_DEFINITIONS})
+  find_soname(${depup} REQUIRED)
+  export_dep()
+  set(${depup}_SONAME ${${depup}_SONAME} PARENT_SCOPE)
+endfunction()
+
+# helper macro for optional deps
+macro(setup_enable_switch)
+  string(TOUPPER ${dep} depup)
+  if(ARGV1)
+    set(enable_switch ${ARGV1})
+  else()
+    set(enable_switch ENABLE_${depup})
+  endif()
+  # normal options are boolean, so we override set our ENABLE_FOO var to allow "auto" handling
+  set(${enable_switch} "AUTO" CACHE STRING "Enable ${depup} support?")
+endmacro()
+
+# add an optional dependency of main application
+# Arguments:
+#   dep name of find rule for dependency, used uppercased for variable prefix
+# On return:
+#   dependency optionally added to ${SYSTEM_INCLUDES}, ${DEPLIBS} and ${DEP_DEFINES}
+function(core_optional_dep dep)
+  setup_enable_switch()
+  if(${enable_switch} STREQUAL AUTO)
+    find_package(${dep})
+  elseif(${${enable_switch}})
+    find_package(${dep} REQUIRED)
+  endif()
+
+  if(${depup}_FOUND)
+    list(APPEND SYSTEM_INCLUDES ${${depup}_INCLUDE_DIRS})
+    list(APPEND DEPLIBS ${${depup}_LIBRARIES})
+    list(APPEND DEP_DEFINES ${${depup}_DEFINITIONS})
+    set(final_message ${final_message} "${depup} enabled: Yes" PARENT_SCOPE)
+    export_dep()
+  else()
+    set(final_message ${final_message} "${depup} enabled: No" PARENT_SCOPE)
+  endif()
+endfunction()
+
+# add an optional dyloaded dependency of main application
+# Arguments:
+#   dep name of find rule for dependency, used uppercased for variable prefix
+# On return:
+#   dependency optionally added to ${SYSTEM_INCLUDES}, ${DEP_DEFINES}, ${dep}_SONAME is set up
+function(core_optional_dyload_dep dep)
+  setup_enable_switch()
+  if(${enable_switch})
+    find_package(${dep})
+    if(${depup}_FOUND)
+      list(APPEND SYSTEM_INCLUDES ${${depup}_INCLUDE_DIRS})
+      find_soname(${depup} REQUIRED)
+      list(APPEND DEP_DEFINES ${${depup}_DEFINITIONS})
+      set(final_message ${final_message} "${depup} enabled: Yes" PARENT_SCOPE)
+      export_dep()
+      set(${depup}_SONAME ${${depup}_SONAME} PARENT_SCOPE)
+    endif()
+  endif()
+endfunction()
+
+function(core_file_read_filtered result filepattern)
+  # Reads STRINGS from text files
+  #  with comments filtered out
+  # Result: [list: result]
+  # Input:  [glob pattern: filepattern]
+  file(GLOB filenames ${filepattern})
+  list(SORT filenames)
+  foreach(filename ${filenames})
+    if(VERBOSE)
+      message(STATUS "core_file_read_filtered - filename: ${filename}")
+    endif()
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${filename})
+    file(STRINGS ${filename} fstrings REGEX "^[^#//]")
+    foreach(fstring ${fstrings})
+      string(REGEX REPLACE "^(.*)#(.*)" "\\1" fstring ${fstring})
+      string(REGEX REPLACE "[ \n\r\t]//.*" "" fstring ${fstring})
+      string(STRIP ${fstring} fstring)
+      list(APPEND filename_strings ${fstring})
+    endforeach()
+  endforeach()
+  set(${result} ${filename_strings} PARENT_SCOPE)
+endfunction()
+
+function(core_add_subdirs_from_filelist files)
+  # Adds subdirectories from a sorted list of files
+  # Input: [list: filenames] [bool: sort]
+  foreach(arg ${ARGN})
+    list(APPEND files ${arg})
+  endforeach()
+  list(SORT files)
+  if(VERBOSE)
+    message(STATUS "core_add_subdirs_from_filelist - got pattern: ${files}")
+  endif()
+  foreach(filename ${files})
+    string(STRIP ${filename} filename)
+    core_file_read_filtered(fstrings ${filename})
+    foreach(subdir ${fstrings})
+      string(REPLACE " " ";" subdir ${subdir})
+      list(GET subdir  0 subdir_src)
+      list(GET subdir -1 subdir_dest)
+      if(VERBOSE)
+        message(STATUS "  core_add_subdirs_from_filelist - adding subdir: ${CORE_SOURCE_DIR}/${subdir_src} -> ${CORE_BUILD_DIR}/${subdir_dest}")
+      endif()
+      add_subdirectory(${CORE_SOURCE_DIR}/${subdir_src} ${CORE_BUILD_DIR}/${subdir_dest})
+    endforeach()
+  endforeach()
+endfunction()
+
+macro(core_add_optional_subdirs_from_filelist pattern)
+  # Adds subdirectories from text files
+  #  if the option(s) in the 3rd field are enabled
+  # Input: [glob pattern: filepattern]
+  foreach(arg ${ARGN})
+    list(APPEND pattern ${arg})
+  endforeach()
+  foreach(elem ${pattern})
+    string(STRIP ${elem} elem)
+    list(APPEND filepattern ${elem})
+  endforeach()
+
+  file(GLOB filenames ${filepattern})
+  list(SORT filenames)
+  if(VERBOSE)
+    message(STATUS "core_add_optional_subdirs_from_filelist - got pattern: ${filenames}")
+  endif()
+
+  foreach(filename ${filenames})
+    if(VERBOSE)
+      message(STATUS "core_add_optional_subdirs_from_filelist - reading file: ${filename}")
+    endif()
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${filename})
+    file(STRINGS ${filename} fstrings REGEX "^[^#//]")
+    foreach(line ${fstrings})
+      string(REPLACE " " ";" line "${line}")
+      list(GET line 0 subdir_src)
+      list(GET line 1 subdir_dest)
+      list(GET line 3 opts)
+      foreach(opt ${opts})
+        if(ENABLE_${opt})
+          if(VERBOSE)
+            message(STATUS "  core_add_optional_subdirs_from_filelist - adding subdir: ${CORE_SOURCE_DIR}/${subdir_src} -> ${CORE_BUILD_DIR}/${subdir_dest}")
+          endif()
+          add_subdirectory(${CORE_SOURCE_DIR}/${subdir_src} ${CORE_BUILD_DIR}/${subdir_dest})
+        else()
+          if(VERBOSE)
+            message(STATUS "  core_add_optional_subdirs_from_filelist: OPTION ${opt} not enabled for ${subdir_src}, skipping subdir")
+          endif()
+        endif()
+      endforeach()
+    endforeach()
+  endforeach()
+endmacro()
+
+# Generates an RFC2822 timestamp
+#
+# The following variable is set:
+#   RFC2822_TIMESTAMP
+function(rfc2822stamp)
+  execute_process(COMMAND date -R
+                  OUTPUT_VARIABLE RESULT)
+  set(RFC2822_TIMESTAMP ${RESULT} PARENT_SCOPE)
+endfunction()
+
+# Generates an user stamp from git config info
+#
+# The following variable is set:
+#   PACKAGE_MAINTAINER - user stamp in the form of "username <username@example.com>"
+#                        if no git tree is found, value is set to "nobody <nobody@example.com>"
+function(userstamp)
+  find_package(Git)
+  if(GIT_FOUND AND EXISTS ${CORE_SOURCE_DIR}/.git)
+    execute_process(COMMAND ${GIT_EXECUTABLE} config user.name
+                    OUTPUT_VARIABLE username
+                    WORKING_DIRECTORY ${CORE_SOURCE_DIR}
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${GIT_EXECUTABLE} config user.email
+                    OUTPUT_VARIABLE useremail
+                    WORKING_DIRECTORY ${CORE_SOURCE_DIR}
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    set(PACKAGE_MAINTAINER "${username} <${useremail}>" PARENT_SCOPE)
+  else()
+    set(PACKAGE_MAINTAINER "nobody <nobody@example.com>" PARENT_SCOPE)
+  endif()
+endfunction()
+
+# Parses git info and sets variables used to identify the build
+# Arguments:
+#   stamp variable name to return
+# Optional Arguments:
+#   FULL: generate git HEAD commit in the form of 'YYYYMMDD-hash'
+#         if git tree is dirty, value is set in the form of 'YYYYMMDD-hash-dirty'
+#         if no git tree is found, value is set in the form of 'YYYYMMDD-nogitfound'
+#         if FULL is not given, stamp is generated following the same process as above
+#         but without 'YYYYMMDD'
+# On return:
+#   Variable is set with generated stamp to PARENT_SCOPE
+function(core_find_git_rev stamp)
+  # allow manual setting GIT_VERSION
+  if(GIT_VERSION)
+    set(${stamp} ${GIT_VERSION} PARENT_SCOPE)
+  else()
+    find_package(Git)
+    if(GIT_FOUND AND EXISTS ${CORE_SOURCE_DIR}/.git)
+      execute_process(COMMAND ${GIT_EXECUTABLE} diff-files --ignore-submodules --quiet --
+                      RESULT_VARIABLE status_code
+                      WORKING_DIRECTORY ${CORE_SOURCE_DIR})
+        if(NOT status_code)
+          execute_process(COMMAND ${GIT_EXECUTABLE} diff-index --ignore-submodules --quiet HEAD --
+                        RESULT_VARIABLE status_code
+                        WORKING_DIRECTORY ${CORE_SOURCE_DIR})
+        endif()
+        if(status_code)
+          execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h-dirty" HEAD
+                          OUTPUT_VARIABLE HASH
+                          WORKING_DIRECTORY ${CORE_SOURCE_DIR})
+          string(SUBSTRING ${HASH} 1 13 HASH)
+        else()
+          execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h" HEAD
+                          OUTPUT_VARIABLE HASH
+                          WORKING_DIRECTORY ${CORE_SOURCE_DIR})
+          string(SUBSTRING ${HASH} 1 7 HASH)
+        endif()
+      execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:"%cd" --date=short HEAD
+                      OUTPUT_VARIABLE DATE
+                      WORKING_DIRECTORY ${CORE_SOURCE_DIR})
+      string(SUBSTRING ${DATE} 1 10 DATE)
+      string(REPLACE "-" "" DATE ${DATE})
+    else()
+      string(TIMESTAMP DATE "%Y%m%d" UTC)
+      set(HASH "nogitfound")
+    endif()
+    cmake_parse_arguments(arg "FULL" "" "" ${ARGN})
+    if(arg_FULL)
+      set(${stamp} ${DATE}-${HASH} PARENT_SCOPE)
+    else()
+      set(${stamp} ${HASH} PARENT_SCOPE)
+    endif()
+  endif()
+endfunction()
+
+# Parses version.txt and libKODI_guilib.h and sets variables
+# used to construct dirs structure, file naming, API version, etc.
+#
+# The following variables are set from version.txt:
+#   APP_NAME - app name
+#   APP_NAME_LC - lowercased app name
+#   APP_NAME_UC - uppercased app name
+#   COMPANY_NAME - company name
+#   APP_VERSION_MAJOR - the app version major
+#   APP_VERSION_MINOR - the app version minor
+#   APP_VERSION_TAG - the app version tag
+#   APP_VERSION_TAG_LC - lowercased app version tag
+#   APP_VERSION - the app version (${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}-${APP_VERSION_TAG})
+#   APP_ADDON_API - the addon API version in the form of 16.9.702
+#   FILE_VERSION - file version in the form of 16,9,702,0 - Windows only
+#
+# The following variables are set from libKODI_guilib.h:
+#   guilib_version - current ADDONGUI API version
+#   guilib_version_min - minimal ADDONGUI API version
+macro(core_find_versions)
+  include(CMakeParseArguments)
+  core_file_read_filtered(version_list ${CORE_SOURCE_DIR}/version.txt)
+  string(REPLACE " " ";" version_list "${version_list}")
+  cmake_parse_arguments(APP "" "APP_NAME;COMPANY_NAME;WEBSITE;VERSION_MAJOR;VERSION_MINOR;VERSION_TAG;VERSION_CODE;ADDON_API" "" ${version_list})
+
+  set(APP_NAME ${APP_APP_NAME}) # inconsistency but APP_APP_NAME looks weird
+  string(TOLOWER ${APP_APP_NAME} APP_NAME_LC)
+  string(TOUPPER ${APP_APP_NAME} APP_NAME_UC)
+  set(COMPANY_NAME ${APP_COMPANY_NAME})
+  set(APP_VERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR})
+  if(APP_VERSION_TAG)
+    set(APP_VERSION ${APP_VERSION}-${APP_VERSION_TAG})
+  endif()
+  string(REPLACE "." "," FILE_VERSION ${APP_ADDON_API}.0)
+  string(TOLOWER ${APP_VERSION_TAG} APP_VERSION_TAG_LC)
+  file(STRINGS ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h guilib_version REGEX "^.*GUILIB_API_VERSION (.*)$")
+  string(REGEX REPLACE ".*\"(.*)\"" "\\1" guilib_version ${guilib_version})
+  file(STRINGS ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h guilib_version_min REGEX "^.*GUILIB_MIN_API_VERSION (.*)$")
+  string(REGEX REPLACE ".*\"(.*)\"" "\\1" guilib_version_min ${guilib_version_min})
+  # unset variables not used anywhere else
+  unset(version_list)
+  unset(APP_APP_NAME)
+
+  # bail if we can't parse version.txt
+  if(NOT DEFINED APP_VERSION_MAJOR OR NOT DEFINED APP_VERSION_MINOR)
+    message(FATAL_ERROR "Could not determine app version! Make sure that ${CORE_SOURCE_DIR}/version.txt exists")
+  endif()
+
+  # bail if we can't parse libKODI_guilib.h
+  if(NOT DEFINED guilib_version OR NOT DEFINED guilib_version_min)
+    message(FATAL_ERROR "Could not determine add-on API version! Make sure that ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h exists")
+  endif()
+endmacro()
+
diff --git a/project/cmake/scripts/common/prepare-env.cmake b/project/cmake/scripts/common/PrepareEnv.cmake
index 8e9bd1c..8e02382 100644
--- a/project/cmake/scripts/common/prepare-env.cmake
+++ b/project/cmake/scripts/common/PrepareEnv.cmake
@@ -1,25 +1,6 @@
-# parse version.txt to get the version info
-if(EXISTS "${APP_ROOT}/version.txt")
-  file(STRINGS "${APP_ROOT}/version.txt" versions)
-  foreach (version ${versions})
-    if(version MATCHES "^VERSION_.*")
-      string(REGEX MATCH "^[^ ]+" version_name ${version})
-      string(REPLACE "${version_name} " "" version_value ${version})
-      set(APP_${version_name} "${version_value}")
-    else()
-      string(REGEX MATCH "^[^ ]+" name ${version})
-      string(REPLACE "${name} " "" value ${version})
-      set(${name} "${value}")
-    endif()
-  endforeach()
-  string(TOLOWER ${APP_NAME} APP_NAME_LC)
-  string(TOUPPER ${APP_NAME} APP_NAME_UC)
-endif()
-
-# bail if we can't parse versions
-if(NOT DEFINED APP_VERSION_MAJOR OR NOT DEFINED APP_VERSION_MINOR)
-  message(FATAL_ERROR "Could not determine app version! make sure that ${APP_ROOT}/version.txt exists")
-endif()
+# parse version.txt and libKODI_guilib.h to get the version and API info
+include(${CORE_SOURCE_DIR}/project/cmake/scripts/common/Macros.cmake)
+core_find_versions()
 
 # in case we need to download something, set KODI_MIRROR to the default if not alread set
 if(NOT DEFINED KODI_MIRROR)
@@ -28,24 +9,19 @@ endif()
 
 ### copy all the addon binding header files to include/kodi
 # make sure include/kodi exists and is empty
-set(APP_LIB_DIR ${DEPENDS_PATH}/lib/${APP_NAME_LC})
+set(APP_LIB_DIR ${ADDON_DEPENDS_PATH}/lib/${APP_NAME_LC})
 if(NOT EXISTS "${APP_LIB_DIR}/")
   file(MAKE_DIRECTORY ${APP_LIB_DIR})
 endif()
 
-set(APP_INCLUDE_DIR ${DEPENDS_PATH}/include/${APP_NAME_LC})
-if(NOT EXISTS "${APP_INCLUDE_DIR}/")
-  file(MAKE_DIRECTORY ${APP_INCLUDE_DIR})
+set(APP_DATA_DIR ${ADDON_DEPENDS_PATH}/share/${APP_NAME_LC})
+if(NOT EXISTS "${APP_DATA_DIR}/")
+  file(MAKE_DIRECTORY ${APP_DATA_DIR})
 endif()
 
-# we still need XBMC_INCLUDE_DIR and XBMC_LIB_DIR for backwards compatibility to xbmc
-set(XBMC_LIB_DIR ${DEPENDS_PATH}/lib/xbmc)
-if(NOT EXISTS "${XBMC_LIB_DIR}/")
-  file(MAKE_DIRECTORY ${XBMC_LIB_DIR})
-endif()
-set(XBMC_INCLUDE_DIR ${DEPENDS_PATH}/include/xbmc)
-if(NOT EXISTS "${XBMC_INCLUDE_DIR}/")
-  file(MAKE_DIRECTORY ${XBMC_INCLUDE_DIR})
+set(APP_INCLUDE_DIR ${ADDON_DEPENDS_PATH}/include/${APP_NAME_LC})
+if(NOT EXISTS "${APP_INCLUDE_DIR}/")
+  file(MAKE_DIRECTORY ${APP_INCLUDE_DIR})
 endif()
 
 # make sure C++11 is always set
@@ -56,42 +32,23 @@ if(NOT WIN32)
   endif()
 endif()
 
-# generate the proper kodi-config.cmake file
-configure_file(${APP_ROOT}/project/cmake/kodi-config.cmake.in ${APP_LIB_DIR}/kodi-config.cmake @ONLY)
+# generate the proper KodiConfig.cmake file
+configure_file(${CORE_SOURCE_DIR}/project/cmake/KodiConfig.cmake.in ${APP_LIB_DIR}/KodiConfig.cmake @ONLY)
 
 # copy cmake helpers to lib/kodi
-file(COPY ${APP_ROOT}/project/cmake/scripts/common/addon-helpers.cmake
-          ${APP_ROOT}/project/cmake/scripts/common/addoptions.cmake
+file(COPY ${CORE_SOURCE_DIR}/project/cmake/scripts/common/AddonHelpers.cmake
+          ${CORE_SOURCE_DIR}/project/cmake/scripts/common/AddOptions.cmake
      DESTINATION ${APP_LIB_DIR})
 
-# generate xbmc-config.cmake for backwards compatibility to xbmc
-configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY)
-
 ### copy all the addon binding header files to include/kodi
 # parse addon-bindings.mk to get the list of header files to copy
-file(STRINGS ${APP_ROOT}/xbmc/addons/addon-bindings.mk bindings)
-string(REPLACE "\n" ";" bindings "${bindings}")
+core_file_read_filtered(bindings ${CORE_SOURCE_DIR}/xbmc/addons/addon-bindings.mk)
 foreach(binding ${bindings})
   string(REPLACE " =" ";" binding "${binding}")
   string(REPLACE "+=" ";" binding "${binding}")
   list(GET binding 1 header)
   # copy the header file to include/kodi
-  file(COPY ${APP_ROOT}/${header} DESTINATION ${APP_INCLUDE_DIR})
-
-  # auto-generate header files for backwards compatibility to xbmc with deprecation warning
-  # but only do it if the file doesn't already exist
-  get_filename_component(headerfile ${header} NAME)
-  if (NOT EXISTS "${XBMC_INCLUDE_DIR}/${headerfile}")
-    file(WRITE ${XBMC_INCLUDE_DIR}/${headerfile}
-"#pragma once
-#define DEPRECATION_WARNING \"Including xbmc/${headerfile} has been deprecated, please use kodi/${headerfile}\"
-#ifdef _MSC_VER
-  #pragma message(\"WARNING: \" DEPRECATION_WARNING)
-#else
-  #warning DEPRECATION_WARNING
-#endif
-#include \"kodi/${headerfile}\"")
-  endif()
+  configure_file(${CORE_SOURCE_DIR}/${header} ${APP_INCLUDE_DIR} COPYONLY)
 endforeach()
 
 ### on windows we need a "patch" binary to be able to patch 3rd party sources
@@ -125,12 +82,12 @@ if(WIN32)
     endif()
 
     # copy patch.exe into the output directory
-    file(INSTALL ${PATCH_BINARY_PATH} DESTINATION ${DEPENDS_PATH}/bin)
+    file(INSTALL ${PATCH_BINARY_PATH} DESTINATION ${ADDON_DEPENDS_PATH}/bin)
 
     # make sure that cmake can find the copied patch.exe
     find_program(PATCH_FOUND NAMES patch patch.exe)
     if(NOT PATCH_FOUND)
-      message(FATAL_ERROR "ERROR installing patch utility from ${PATCH_BINARY_PATH} to ${DEPENDS_PATH}/bin")
+      message(FATAL_ERROR "ERROR installing patch utility from ${PATCH_BINARY_PATH} to ${ADDON_DEPENDS_PATH}/bin")
     endif()
   endif()
 endif()
diff --git a/project/cmake/scripts/common/projectmacros.cmake b/project/cmake/scripts/common/ProjectMacros.cmake
index 7ce4ee9..e73ef90 100644
--- a/project/cmake/scripts/common/projectmacros.cmake
+++ b/project/cmake/scripts/common/ProjectMacros.cmake
@@ -8,7 +8,7 @@
 #   xbt is added to ${XBT_FILES}
 function(pack_xbt input output)
   file(GLOB_RECURSE MEDIA_FILES ${input}/*)
-  get_filename_component(dir ${output} PATH)
+  get_filename_component(dir ${output} DIRECTORY)
   add_custom_command(OUTPUT  ${output}
                      COMMAND ${CMAKE_COMMAND} -E make_directory ${dir}
                      COMMAND TexturePacker::TexturePacker
@@ -23,18 +23,17 @@ endfunction()
 # Add a skin to installation list, mirroring it in build tree, packing textures
 # Arguments:
 #   skin     skin directory
-#   relative relative base path in build tree
 # On return:
 #   xbt is added to ${XBT_FILES}, data added to ${install_data}, mirror in build tree
-function(copy_skin_to_buildtree skin relative)
+function(copy_skin_to_buildtree skin)
   file(GLOB_RECURSE FILES ${skin}/*)
   file(GLOB_RECURSE MEDIA_FILES ${skin}/media/*)
   list(REMOVE_ITEM FILES ${MEDIA_FILES})
   foreach(file ${FILES})
-    copy_file_to_buildtree(${file} ${relative})
+    copy_file_to_buildtree(${file})
   endforeach()
   file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${dest}/media)
-  string(REPLACE "${relative}/" "" dest ${skin})
+  string(REPLACE "${CORE_SOURCE_DIR}/" "" dest ${skin})
   pack_xbt(${skin}/media ${CMAKE_BINARY_DIR}/${dest}/media/Textures.xbt)
 
   file(GLOB THEMES RELATIVE ${skin}/themes ${skin}/themes/*)
@@ -54,6 +53,9 @@ function(GTEST_ADD_TESTS executable extra_args)
         message(FATAL_ERROR "Missing ARGN: Read the documentation for GTEST_ADD_TESTS")
     endif()
     foreach(source ${ARGN})
+        # This assumes that every source file passed in exists. Consider using
+        # SUPPORT_SOURCES for source files which do not contain tests and might
+        # have to be generated.
         file(READ "${source}" contents)
         string(REGEX MATCHALL "TEST_?[F]?\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents})
         foreach(hit ${found_tests})
diff --git a/project/cmake/scripts/common/Uninstall.cmake b/project/cmake/scripts/common/Uninstall.cmake
new file mode 100644
index 0000000..5660e19
--- /dev/null
+++ b/project/cmake/scripts/common/Uninstall.cmake
@@ -0,0 +1,22 @@
+# Uninstall target
+set(MANIFEST ${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt)
+if(EXISTS ${MANIFEST})
+  file(STRINGS ${MANIFEST} files)
+    foreach(file IN LISTS files)
+      if(EXISTS $ENV{DESTDIR}${file})
+        message(STATUS "Uninstalling: ${file}")
+        execute_process(
+          COMMAND ${CMAKE_COMMAND} -E remove $ENV{DESTDIR}${file}
+          OUTPUT_VARIABLE rm_out
+          RESULT_VARIABLE rm_retval
+        )
+        if(NOT "${rm_retval}" STREQUAL 0)
+          message(FATAL_ERROR "Failed to remove file: $ENV{DESTDIR}${file}")
+        endif()
+      else()
+        message(STATUS "File does not exist: $ENV{DESTDIR}${file}")
+      endif()
+    endforeach(file)
+else()
+  message(STATUS "Cannot find install manifest: '${MANIFEST}'")
+endif()
diff --git a/project/cmake/scripts/common/addon-helpers.cmake b/project/cmake/scripts/common/addon-helpers.cmake
deleted file mode 100644
index caef610..0000000
--- a/project/cmake/scripts/common/addon-helpers.cmake
+++ /dev/null
@@ -1,171 +0,0 @@
-# Workaround for the fact that cpack's filenames are not customizable.
-# Each add-on is added as a separate component to facilitate zip/tgz packaging.
-# The filenames are always of the form basename-component, which is 
-# incompatible with the addonid-version scheme we want. This hack renames
-# the files from the file names generated by the 'package' target.
-# Sadly we cannot extend the 'package' target, as it is a builtin target, see 
-# http://public.kitware.com/Bug/view.php?id=8438
-# Thus, we have to add an 'addon-package' target.
-add_custom_target(addon-package
-                  COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package)
-
-macro(add_cpack_workaround target version ext)
-  if(NOT PACKAGE_DIR)
-    set(PACKAGE_DIR "${CMAKE_INSTALL_PREFIX}/zips")
-  endif()
-
-  add_custom_command(TARGET addon-package PRE_BUILD
-                     COMMAND ${CMAKE_COMMAND} -E make_directory ${PACKAGE_DIR}
-                     COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_PACKAGE_DIRECTORY}/addon-${target}-${version}.${ext} ${PACKAGE_DIR}/${target}-${version}.${ext})
-endmacro()
-
-# Grab the version from a given add-on's addon.xml
-macro (addon_version dir prefix)
-  IF(EXISTS ${PROJECT_SOURCE_DIR}/${dir}/addon.xml.in)
-    FILE(READ ${PROJECT_SOURCE_DIR}/${dir}/addon.xml.in ADDONXML)
-  ELSE()
-    FILE(READ ${dir}/addon.xml ADDONXML)
-  ENDIF()
-
-  STRING(REGEX MATCH "<addon[^>]*version.?=.?.[0-9\\.]+" VERSION_STRING ${ADDONXML}) 
-  STRING(REGEX REPLACE ".*version=.([0-9\\.]+).*" "\\1" ${prefix}_VERSION ${VERSION_STRING})
-  message(STATUS ${prefix}_VERSION=${${prefix}_VERSION})
-endmacro()
-
-# Build, link and optionally package an add-on
-macro (build_addon target prefix libs)
-  ADD_LIBRARY(${target} ${${prefix}_SOURCES})
-  TARGET_LINK_LIBRARIES(${target} ${${libs}})
-  addon_version(${target} ${prefix})
-  SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${${prefix}_VERSION}
-                                             SOVERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}
-                                             PREFIX "")
-  IF(OS STREQUAL "android")
-    SET_TARGET_PROPERTIES(${target} PROPERTIES PREFIX "lib")
-  ENDIF(OS STREQUAL "android")
-
-  # get the library's location
-  SET(LIBRARY_LOCATION $<TARGET_FILE:${target}>)
-  # get the library's filename
-  if("${CORE_SYSTEM_NAME}" STREQUAL "android")
-    # for android we need the filename without any version numbers
-    set(LIBRARY_FILENAME $<TARGET_LINKER_FILE_NAME:${target}>)
-  else()
-    SET(LIBRARY_FILENAME $<TARGET_FILE_NAME:${target}>)
-  endif()
-
-  # if there's an addon.xml.in we need to generate the addon.xml
-  IF(EXISTS ${PROJECT_SOURCE_DIR}/${target}/addon.xml.in)
-    SET(PLATFORM ${CORE_SYSTEM_NAME})
-
-    FILE(READ ${PROJECT_SOURCE_DIR}/${target}/addon.xml.in addon_file)
-    STRING(CONFIGURE "${addon_file}" addon_file_conf @ONLY)
-    FILE(GENERATE OUTPUT ${PROJECT_SOURCE_DIR}/${target}/addon.xml CONTENT "${addon_file_conf}")
-  ENDIF()
-
-  # set zip as default if addon-package is called without PACKAGE_XXX
-  SET(CPACK_GENERATOR "ZIP")
-  SET(ext "zip")
-  IF(PACKAGE_ZIP OR PACKAGE_TGZ)
-    IF(PACKAGE_TGZ)
-      SET(CPACK_GENERATOR "TGZ")
-      SET(ext "tar.gz")
-    ENDIF(PACKAGE_TGZ)
-    SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
-    set(CPACK_PACKAGE_FILE_NAME addon)
-    IF(CMAKE_BUILD_TYPE STREQUAL "Release")
-      SET(CPACK_STRIP_FILES TRUE)
-    ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
-    set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
-    set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
-    list(APPEND CPACK_COMPONENTS_ALL ${target}-${${prefix}_VERSION})
-    # Pack files together to create an archive
-    INSTALL(DIRECTORY ${target} DESTINATION ./ COMPONENT ${target}-${${prefix}_VERSION} PATTERN "addon.xml.in" EXCLUDE)
-    IF(WIN32)
-      if(NOT CPACK_PACKAGE_DIRECTORY)
-        # determine the temporary path
-        file(TO_CMAKE_PATH "$ENV{TEMP}" WIN32_TEMP_PATH)
-        string(LENGTH "${WIN32_TEMP_PATH}" WIN32_TEMP_PATH_LENGTH)
-        string(LENGTH "${PROJECT_BINARY_DIR}" PROJECT_BINARY_DIR_LENGTH)
-
-        # check if the temporary path is shorter than the default packaging directory path
-        if(WIN32_TEMP_PATH_LENGTH GREATER 0 AND WIN32_TEMP_PATH_LENGTH LESS PROJECT_BINARY_DIR_LENGTH)
-          # set the directory used by CPack for packaging to the temp directory
-          set(CPACK_PACKAGE_DIRECTORY ${WIN32_TEMP_PATH})
-        endif()
-      endif()
-
-      # in case of a VC++ project the installation location contains a $(Configuration) VS variable
-      # we replace it with ${CMAKE_BUILD_TYPE} (which doesn't cover the case when the build configuration
-      # is changed within Visual Studio)
-      string(REPLACE "$(Configuration)" "${CMAKE_BUILD_TYPE}" LIBRARY_LOCATION "${LIBRARY_LOCATION}")
-
-      # install the generated DLL file
-      INSTALL(PROGRAMS ${LIBRARY_LOCATION} DESTINATION ${target}
-              COMPONENT ${target}-${${prefix}_VERSION})
-
-      IF(CMAKE_BUILD_TYPE MATCHES Debug)
-        # for debug builds also install the PDB file
-        get_filename_component(LIBRARY_DIR ${LIBRARY_LOCATION} DIRECTORY)
-        INSTALL(FILES $<TARGET_PDB_FILE:${target}> DESTINATION ${target}
-                COMPONENT ${target}-${${prefix}_VERSION})
-      ENDIF()
-    ELSE(WIN32)
-      if(NOT CPACK_PACKAGE_DIRECTORY)
-        set(CPACK_PACKAGE_DIRECTORY ${CMAKE_BINARY_DIR})
-      endif()
-      INSTALL(TARGETS ${target} DESTINATION ${target}
-              COMPONENT ${target}-${${prefix}_VERSION})
-    ENDIF(WIN32)
-    add_cpack_workaround(${target} ${${prefix}_VERSION} ${ext})
-  ELSE(PACKAGE_ZIP OR PACKAGE_TGZ)
-    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-      if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR NOT CMAKE_INSTALL_PREFIX)
-        message(STATUS "setting install paths to match ${APP_NAME}: CMAKE_INSTALL_PREFIX: ${${APP_NAME_UC}_PREFIX}")
-        set(CMAKE_INSTALL_PREFIX "${${APP_NAME_UC}_PREFIX}" CACHE PATH "${APP_NAME} install prefix" FORCE)
-        set(CMAKE_INSTALL_LIBDIR "${${APP_NAME_UC}_LIB_DIR}" CACHE PATH "${APP_NAME} install libdir" FORCE)
-      elseif(NOT CMAKE_INSTALL_PREFIX STREQUAL "${${APP_NAME_UC}_PREFIX}" AND NOT OVERRIDE_PATHS)
-        message(FATAL_ERROR "CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} differs from ${APP_NAME} prefix ${${APP_NAME_UC}_PREFIX}. Please pass -DOVERRIDE_PATHS=1 to skip this check")
-      else()
-        if(NOT CMAKE_INSTALL_LIBDIR)
-          set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${APP_NAME_LC}")
-        endif()
-      endif()
-    else()
-      set(CMAKE_INSTALL_LIBDIR "lib/${APP_NAME_LC}")
-    endif()
-    INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target})
-    INSTALL(DIRECTORY ${target} DESTINATION share/${APP_NAME_LC}/addons PATTERN "addon.xml.in" EXCLUDE)
-  ENDIF(PACKAGE_ZIP OR PACKAGE_TGZ)
-endmacro()
-
-# finds a path to a given file (recursive)
-function (kodi_find_path var_name filename search_path strip_file)
-  file(GLOB_RECURSE PATH_TO_FILE ${search_path} ${filename})
-  if(strip_file)
-    string(REPLACE ${filename} "" PATH_TO_FILE ${PATH_TO_FILE})
-  endif(strip_file)
-  set (${var_name} ${PATH_TO_FILE} PARENT_SCOPE)
-endfunction()
-
-# Cmake build options
-include(addoptions)
-include(TestCXXAcceptsFlag)
-OPTION(PACKAGE_ZIP "Package Zip file?" OFF)
-OPTION(PACKAGE_TGZ "Package TGZ file?" OFF)
-OPTION(BUILD_SHARED_LIBS "Build shared libs?" ON)
-
-# LTO support?
-CHECK_CXX_ACCEPTS_FLAG("-flto" HAVE_LTO)
-IF(HAVE_LTO)
-  OPTION(USE_LTO "use link time optimization" OFF)
-  IF(USE_LTO)
-    add_options(ALL_LANGUAGES ALL_BUILDS "-flto")
-  ENDIF(USE_LTO)
-ENDIF(HAVE_LTO) 
-
-# set this to try linking dependencies as static as possible
-IF(ADDONS_PREFER_STATIC_LIBS)
-  SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-ENDIF(ADDONS_PREFER_STATIC_LIBS)
-
diff --git a/project/cmake/scripts/common/addoptions.cmake b/project/cmake/scripts/common/addoptions.cmake
deleted file mode 100644
index 0ebb823..0000000
--- a/project/cmake/scripts/common/addoptions.cmake
+++ /dev/null
@@ -1,82 +0,0 @@
-# - Add options without repeating them on the command line
-#
-# Synopsis:
-#
-#       add_options (lang build opts)
-#
-# where:
-#
-#       lang       Name of the language whose compiler should receive the
-#                  options, e.g. CXX. If a comma-separated list is received
-#                  then the option is added for all those languages. Use the
-#                  special value ALL_LANGUAGES for these languages: CXX, C
-#                  and Fortran
-#
-#       build      Kind of build to which this options should apply,
-#              such as DEBUG and RELEASE. This can also be a comma-
-#                  separated list. Use the special value ALL_BUILDS to apply
-#                  to all builds.
-#
-#       opts       List of options to add. Each should be quoted.
-#
-# Example:
-#
-#       add_options (CXX RELEASE "-O3" "-DNDEBUG" "-Wall")
-
-function (add_options langs builds)
-  # special handling of empty language specification
-  if ("${langs}" STREQUAL "ALL_LANGUAGES")
-        set (langs CXX C Fortran)
-  endif ("${langs}" STREQUAL "ALL_LANGUAGES")
-  foreach (lang IN LISTS langs)
-        # prepend underscore if necessary
-        foreach (build IN LISTS builds)
-          if (NOT ("${build}" STREQUAL "ALL_BUILDS"))
-                set (_bld "_${build}")
-                string (TOUPPER "${_bld}" _bld)
-          else (NOT ("${build}" STREQUAL "ALL_BUILDS"))
-                set (_bld "")
-          endif (NOT ("${build}" STREQUAL "ALL_BUILDS"))
-          foreach (_opt IN LISTS ARGN)
-                set (_var "CMAKE_${lang}_FLAGS${_bld}")
-                #message (STATUS "Adding \"${_opt}\" to \${${_var}}")
-                # remove it first
-                string (REPLACE "${_opt}" "" _without "${${_var}}")
-                string (STRIP "${_without}" _without)
-                # we need to strip this one as well, so they are comparable
-                string (STRIP "${${_var}}" _stripped)
-                # if it wasn't there, then add it at the end
-                if ("${_without}" STREQUAL "${_stripped}")
-                  # don't add any extra spaces if no options yet are set
-                  if (NOT ${_stripped} STREQUAL "")
-                        set (${_var} "${_stripped} ${_opt}")
-                  else (NOT ${_stripped} STREQUAL "")
-                        set (${_var} "${_opt}")
-                  endif (NOT ${_stripped} STREQUAL "")
-                  set (${_var} "${${_var}}" PARENT_SCOPE)
-                endif ("${_without}" STREQUAL "${_stripped}")
-          endforeach (_opt)
-        endforeach (build)
-  endforeach (lang)
-endfunction (add_options lang build)
-
-# set varname to flag unless user has specified something that matches regex
-function (set_default_option varname flag regex)
-  if (NOT "$ENV{CXXFLAGS}" MATCHES "${regex}"
-          AND NOT "${CMAKE_CXX_FLAGS}" MATCHES "${regex}"
-          AND NOT "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}" MATCHES "${regex}")
-        set (${varname} ${flag} PARENT_SCOPE)
-  else (NOT "$ENV{CXXFLAGS}" MATCHES "${regex}"
-          AND NOT "${CMAKE_CXX_FLAGS}" MATCHES "${regex}"
-          AND NOT "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}" MATCHES "${regex}")
-        set (${varname} PARENT_SCOPE)
-  endif (NOT "$ENV{CXXFLAGS}" MATCHES "${regex}"
-        AND NOT "${CMAKE_CXX_FLAGS}" MATCHES "${regex}"
-        AND NOT "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}" MATCHES "${regex}")
-endfunction (set_default_option)
-
-# note: this must be called before project()
-macro (no_default_options)
-  # prevent the platform probe to set options
-  set (CMAKE_NOT_USING_CONFIG_FLAGS TRUE)
-endmacro (no_default_options)
diff --git a/project/cmake/scripts/common/generateversionedfiles.cmake b/project/cmake/scripts/common/generateversionedfiles.cmake
deleted file mode 100644
index ea1fad5..0000000
--- a/project/cmake/scripts/common/generateversionedfiles.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-include(${CORE_SOURCE_DIR}/project/cmake/scripts/common/macros.cmake)
-
-core_find_versions()
-file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/addons/xbmc.addon)
-file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/addons/kodi.guilib)
-configure_file(${CORE_SOURCE_DIR}/addons/xbmc.addon/addon.xml.in
-               ${CMAKE_BINARY_DIR}/addons/xbmc.addon/addon.xml @ONLY)
-configure_file(${CORE_SOURCE_DIR}/addons/kodi.guilib/addon.xml.in
-               ${CMAKE_BINARY_DIR}/addons/kodi.guilib/addon.xml @ONLY)
-configure_file(${CORE_SOURCE_DIR}/xbmc/CompileInfo.cpp.in
-               ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/xbmc/CompileInfo.cpp @ONLY)
diff --git a/project/cmake/scripts/common/macros.cmake b/project/cmake/scripts/common/macros.cmake
deleted file mode 100644
index 0900740..0000000
--- a/project/cmake/scripts/common/macros.cmake
+++ /dev/null
@@ -1,383 +0,0 @@
-# This script holds the main functions used to construct the build system
-
-# include system specific macros
-include(${CORE_SOURCE_DIR}/project/cmake/scripts/${CORE_SYSTEM_NAME}/macros.cmake)
-
-# Add a library, optionally as a dependency of the main application
-# Arguments:
-#   name name of the library to add
-# Optional Arguments:
-#   NO_MAIN_DEPENDS if specified, the library is not added to main depends
-# Implicit arguments:
-#   SOURCES the sources of the library
-#   HEADERS the headers of the library (only for IDE support)
-#   OTHERS  other library related files (only for IDE support)
-# On return:
-#   Library will be built, optionally added to ${core_DEPENDS}
-function(core_add_library name)
-  cmake_parse_arguments(arg "NO_MAIN_DEPENDS" "" "" ${ARGN})
-
-  if(NOT SOURCES)
-      message(STATUS "No sources added to ${name} skipping")
-      return()
-  endif()
-
-  add_library(${name} STATIC ${SOURCES} ${HEADERS} ${OTHERS})
-  set_target_properties(${name} PROPERTIES PREFIX "")
-  if(NOT arg_NO_MAIN_DEPENDS)
-    set(core_DEPENDS ${name} ${core_DEPENDS} CACHE STRING "" FORCE)
-  endif()
-
-  # Add precompiled headers to Kodi main libraries
-  if(WIN32 AND "${CMAKE_CURRENT_LIST_DIR}" MATCHES "^${CORE_SOURCE_DIR}/xbmc")
-    add_precompiled_header(${name} pch.h ${CORE_SOURCE_DIR}/xbmc/win32/pch.cpp
-                           PCH_TARGET kodi)
-  endif()
-
-  # IDE support
-  if(CMAKE_GENERATOR MATCHES "Xcode")
-    file(RELATIVE_PATH parentfolder ${CORE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
-    set_target_properties(${name} PROPERTIES FOLDER "${parentfolder}")
-  elseif(CMAKE_GENERATOR MATCHES "Visual Studio")
-    file(RELATIVE_PATH foldername ${CORE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-    set_target_properties(${name} PROPERTIES FOLDER "${foldername}")
-    source_group(" " REGULAR_EXPRESSION ".*")
-  endif()
-endfunction()
-
-# Add a test library, and add sources to list for gtest integration macros
-function(core_add_test_library name)
-  core_add_library(${name} NO_MAIN_DEPENDS)
-  set_target_properties(${name} PROPERTIES EXCLUDE_FROM_ALL 1)
-  foreach(src ${SOURCES})
-    set(test_sources ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${test_sources} CACHE STRING "" FORCE)
-  endforeach()
-  set(test_archives ${test_archives} ${name} CACHE STRING "" FORCE)
-endfunction()
-
-# Add a data file to installation list with a mirror in build tree
-# Arguments:
-#   file     full path to file to mirror
-#   relative the relative base of file path in the build/install tree
-# Optional Arguments:
-#   NO_INSTALL: exclude file from installation target
-# Implicit arguments:
-#   CORE_SOURCE_DIR - root of source tree
-# On return:
-#   Files is mirrored to the build tree and added to ${install_data}
-#   (if NO_INSTALL is not given).
-function(copy_file_to_buildtree file relative)
-  cmake_parse_arguments(arg "NO_INSTALL" "" "" ${ARGN})
-  string(REPLACE "${relative}/" "" outfile ${file})
-  get_filename_component(outdir ${outfile} DIRECTORY)
-
-  if(NOT TARGET export-files)
-    file(REMOVE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ExportFiles.cmake)
-    add_custom_target(export-files ALL COMMENT "Copying files into build tree"
-                      COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ExportFiles.cmake)
-  endif()
-  if(NOT ${CORE_SOURCE_DIR} MATCHES ${CMAKE_BINARY_DIR})
-    if(VERBOSE)
-      message(STATUS "copy_file_to_buildtree - copying file: ${file} -> ${CMAKE_BINARY_DIR}/${outfile}")
-    endif()
-    file(APPEND ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ExportFiles.cmake
-         "file(COPY \"${file}\" DESTINATION \"${CMAKE_BINARY_DIR}/${outdir}\")\n")
-  endif()
-  if(NOT arg_NO_INSTALL)
-    list(APPEND install_data ${outfile})
-    set(install_data ${install_data} PARENT_SCOPE)
-  endif()
-endfunction()
-
-# Add data files to installation list with a mirror in build tree.
-# reads list of files to install from a given list of text files.
-# Arguments:
-#   pattern globbing pattern for text files to read
-# Optional Arguments:
-#   NO_INSTALL: exclude files from installation target
-# Implicit arguments:
-#   CORE_SOURCE_DIR - root of source tree
-# On return:
-#   Files are mirrored to the build tree and added to ${install_data}
-#   (if NO_INSTALL is not given).
-function(copy_files_from_filelist_to_buildtree pattern)
-  # copies files listed in text files to the buildtree
-  # Input: [glob pattern: filepattern]
-  cmake_parse_arguments(arg "NO_INSTALL" "" "" ${ARGN})
-  list(APPEND pattern ${ARGN})
-  list(SORT pattern)
-  if(VERBOSE)
-    message(STATUS "copy_files_from_filelist_to_buildtree - got pattern: ${pattern}")
-  endif()
-  foreach(pat ${pattern})
-    file(GLOB filenames ${pat})
-    foreach(filename ${filenames})
-      string(STRIP ${filename} filename)
-      core_file_read_filtered(fstrings ${filename})
-      foreach(dir ${fstrings})
-        file(GLOB_RECURSE files RELATIVE ${CORE_SOURCE_DIR} ${CORE_SOURCE_DIR}/${dir})
-        foreach(file ${files})
-          if(arg_NO_INSTALL)
-            copy_file_to_buildtree(${CORE_SOURCE_DIR}/${file} ${CORE_SOURCE_DIR} NO_INSTALL)
-          else()
-            copy_file_to_buildtree(${CORE_SOURCE_DIR}/${file} ${CORE_SOURCE_DIR})
-          endif()
-        endforeach()
-      endforeach()
-    endforeach()
-  endforeach()
-  set(install_data ${install_data} PARENT_SCOPE)
-endfunction()
-
-# helper macro to set modified variables in parent scope
-macro(export_dep)
-  set(SYSTEM_INCLUDES ${SYSTEM_INCLUDES} PARENT_SCOPE)
-  set(DEPLIBS ${DEPLIBS} PARENT_SCOPE)
-  set(DEP_DEFINES ${DEP_DEFINES} PARENT_SCOPE)
-  set(${depup}_FOUND ${${depup}_FOUND} PARENT_SCOPE)
-  mark_as_advanced(${depup}_LIBRARIES)
-endmacro()
-
-# add a required dependency of main application
-# Arguments:
-#   dep name of find rule for dependency, used uppercased for variable prefix
-# On return:
-#   dependency added to ${SYSTEM_INCLUDES}, ${DEPLIBS} and ${DEP_DEFINES}
-function(core_require_dep dep)
-  find_package(${dep} REQUIRED)
-  string(TOUPPER ${dep} depup)
-  list(APPEND SYSTEM_INCLUDES ${${depup}_INCLUDE_DIRS})
-  list(APPEND DEPLIBS ${${depup}_LIBRARIES})
-  list(APPEND DEP_DEFINES ${${depup}_DEFINITIONS})
-  export_dep()
-endfunction()
-
-# add a required dyloaded dependency of main application
-# Arguments:
-#   dep name of find rule for dependency, used uppercased for variable prefix
-# On return:
-#   dependency added to ${SYSTEM_INCLUDES}, ${dep}_SONAME is set up
-function(core_require_dyload_dep dep)
-  find_package(${dep} REQUIRED)
-  string(TOUPPER ${dep} depup)
-  list(APPEND SYSTEM_INCLUDES ${${depup}_INCLUDE_DIRS})
-  list(APPEND DEP_DEFINES ${${depup}_DEFINITIONS})
-  find_soname(${depup} REQUIRED)
-  export_dep()
-  set(${depup}_SONAME ${${depup}_SONAME} PARENT_SCOPE)
-endfunction()
-
-# helper macro for optional deps
-macro(setup_enable_switch)
-  string(TOUPPER ${dep} depup)
-  if (ARGV1)
-    set(enable_switch ${ARGV1})
-  else()
-    set(enable_switch ENABLE_${depup})
-  endif()
-endmacro()
-
-# add an optional dependency of main application
-# Arguments:
-#   dep name of find rule for dependency, used uppercased for variable prefix
-# On return:
-#   dependency optionally added to ${SYSTEM_INCLUDES}, ${DEPLIBS} and ${DEP_DEFINES}
-function(core_optional_dep dep)
-  setup_enable_switch()
-  if(${enable_switch})
-    find_package(${dep})
-    if(${depup}_FOUND)
-      list(APPEND SYSTEM_INCLUDES ${${depup}_INCLUDE_DIRS})
-      list(APPEND DEPLIBS ${${depup}_LIBRARIES})
-      list(APPEND DEP_DEFINES ${${depup}_DEFINITIONS})
-      set(final_message ${final_message} "${depup} enabled: Yes" PARENT_SCOPE)
-      export_dep()
-    else()
-      set(final_message ${final_message} "${depup} enabled: No" PARENT_SCOPE)
-    endif()
-  endif()
-endfunction()
-
-# add an optional dyloaded dependency of main application
-# Arguments:
-#   dep name of find rule for dependency, used uppercased for variable prefix
-# On return:
-#   dependency optionally added to ${SYSTEM_INCLUDES}, ${DEP_DEFINES}, ${dep}_SONAME is set up
-function(core_optional_dyload_dep dep)
-  setup_enable_switch()
-  if(${enable_switch})
-    find_package(${dep})
-    if(${depup}_FOUND)
-      list(APPEND SYSTEM_INCLUDES ${${depup}_INCLUDE_DIRS})
-      find_soname(${depup} REQUIRED)
-      list(APPEND DEP_DEFINES ${${depup}_DEFINITIONS})
-      set(final_message ${final_message} "${depup} enabled: Yes" PARENT_SCOPE)
-      export_dep()
-      set(${depup}_SONAME ${${depup}_SONAME} PARENT_SCOPE)
-    endif()
-  endif()
-endfunction()
-
-function(core_file_read_filtered result filepattern)
-  # Reads STRINGS from text files
-  #  with comments filtered out
-  # Result: [list: result]
-  # Input:  [glob pattern: filepattern]
-  file(GLOB filenames ${filepattern})
-  list(SORT filenames)
-  foreach(filename ${filenames})
-    if(VERBOSE)
-      message(STATUS "core_file_read_filtered - filename: ${filename}")
-    endif()
-    file(STRINGS ${filename} fstrings REGEX "^[^#//]")
-    foreach(fstring ${fstrings})
-      string(REGEX REPLACE "^(.*)#(.*)" "\\1" fstring ${fstring})
-      string(REGEX REPLACE "//.*" "" fstring ${fstring})
-      string(STRIP ${fstring} fstring)
-      list(APPEND filename_strings ${fstring})
-    endforeach()
-  endforeach()
-  set(${result} ${filename_strings} PARENT_SCOPE)
-endfunction()
-
-function(core_add_subdirs_from_filelist files)
-  # Adds subdirectories from a sorted list of files
-  # Input: [list: filenames] [bool: sort]
-  foreach(arg ${ARGN})
-    list(APPEND files ${arg})
-  endforeach()
-  list(SORT files)
-  if(VERBOSE)
-    message(STATUS "core_add_subdirs_from_filelist - got pattern: ${files}")
-  endif()
-  foreach(filename ${files})
-    string(STRIP ${filename} filename)
-    core_file_read_filtered(fstrings ${filename})
-    foreach(subdir ${fstrings})
-      STRING_SPLIT(subdir " " ${subdir})
-      list(GET subdir  0 subdir_src)
-      list(GET subdir -1 subdir_dest)
-      if(VERBOSE)
-        message(STATUS "  core_add_subdirs_from_filelist - adding subdir: ${CORE_SOURCE_DIR}${subdir_src} -> ${CORE_BUILD_DIR}/${subdir_dest}")
-      endif()
-      add_subdirectory(${CORE_SOURCE_DIR}/${subdir_src} ${CORE_BUILD_DIR}/${subdir_dest})
-    endforeach()
-  endforeach()
-endfunction()
-
-macro(core_add_optional_subdirs_from_filelist pattern)
-  # Adds subdirectories from text files
-  #  if the option(s) in the 3rd field are enabled
-  # Input: [glob pattern: filepattern]
-  foreach(arg ${ARGN})
-    list(APPEND pattern ${arg})
-  endforeach()
-  foreach(elem ${pattern})
-    string(STRIP ${elem} elem)
-    list(APPEND filepattern ${elem})
-  endforeach()
-
-  file(GLOB filenames ${filepattern})
-  list(SORT filenames)
-  if(VERBOSE)
-    message(STATUS "core_add_optional_subdirs_from_filelist - got pattern: ${filenames}")
-  endif()
-
-  foreach(filename ${filenames})
-    if(VERBOSE)
-      message(STATUS "core_add_optional_subdirs_from_filelist - reading file: ${filename}")
-    endif()
-    file(STRINGS ${filename} fstrings REGEX "^[^#//]")
-    foreach(line ${fstrings})
-      string(REPLACE " " ";" line "${line}")
-      list(GET line 0 subdir_src)
-      list(GET line 1 subdir_dest)
-      list(GET line 3 opts)
-      foreach(opt ${opts})
-        if(ENABLE_${opt})
-          if(VERBOSE)
-            message(STATUS "  core_add_optional_subdirs_from_filelist - adding subdir: ${CORE_SOURCE_DIR}${subdir_src} -> ${CORE_BUILD_DIR}/${subdir_dest}")
-          endif()
-          add_subdirectory(${CORE_SOURCE_DIR}/${subdir_src} ${CORE_BUILD_DIR}/${subdir_dest})
-         else()
-            if(VERBOSE)
-              message(STATUS "  core_add_optional_subdirs_from_filelist: OPTION ${opt} not enabled for ${subdir_src}, skipping subdir")
-            endif()
-        endif()
-      endforeach()
-    endforeach()
-  endforeach()
-endmacro()
-
-macro(today RESULT)
-  if (WIN32)
-    execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT})
-    string(REGEX REPLACE "(..)/(..)/..(..).*" "\\1/\\2/\\3" ${RESULT} ${${RESULT}})
-  elseif(UNIX)
-    execute_process(COMMAND date -u +%F
-                    OUTPUT_VARIABLE ${RESULT})
-    string(REGEX REPLACE "(..)/(..)/..(..).*" "\\1/\\2/\\3" ${RESULT} ${${RESULT}})
-  else()
-    message(SEND_ERROR "date not implemented")
-    set(${RESULT} 000000)
-  endif()
-  string(REGEX REPLACE "(\r?\n)+$" "" ${RESULT} "${${RESULT}}")
-endmacro()
-
-function(core_find_git_rev)
-  find_package(Git)
-  if(GIT_FOUND AND EXISTS ${CORE_SOURCE_DIR}/.git)
-    execute_process(COMMAND ${GIT_EXECUTABLE} diff-files --ignore-submodules --quiet --
-                    RESULT_VARIABLE status_code
-                    WORKING_DIRECTORY ${CORE_SOURCE_DIR})
-      if (NOT status_code)
-        execute_process(COMMAND ${GIT_EXECUTABLE} diff-index --ignore-submodules --quiet HEAD --
-                      RESULT_VARIABLE status_code
-                      WORKING_DIRECTORY ${CORE_SOURCE_DIR})
-      endif()
-      if (status_code)
-        execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h-dirty" HEAD
-                        OUTPUT_VARIABLE HASH
-                        WORKING_DIRECTORY ${CORE_SOURCE_DIR})
-        string(SUBSTRING ${HASH} 1 13 HASH)
-      else()
-        execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h" HEAD
-                        OUTPUT_VARIABLE HASH
-                        WORKING_DIRECTORY ${CORE_SOURCE_DIR})
-        string(SUBSTRING ${HASH} 1 7 HASH)
-      endif()
-    execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:"%cd" --date=short HEAD
-                    OUTPUT_VARIABLE DATE
-                    WORKING_DIRECTORY ${CORE_SOURCE_DIR})
-    string(SUBSTRING ${DATE} 1 10 DATE)
-  else()
-    today(DATE)
-    set(HASH "nogitfound")
-  endif()
-  string(REPLACE "-" "" DATE ${DATE})
-  set(GIT_REV "${DATE}-${HASH}")
-  if(GIT_REV)
-    set(APP_SCMID ${GIT_REV} PARENT_SCOPE)
-  endif()
-endfunction()
-
-macro(core_find_versions)
-  include(CMakeParseArguments)
-  core_file_read_filtered(version_list ${CORE_SOURCE_DIR}/version.txt)
-  string(REPLACE " " ";" version_list "${version_list}")
-  cmake_parse_arguments(APP "" "VERSION_MAJOR;VERSION_MINOR;VERSION_TAG;VERSION_CODE;ADDON_API;APP_NAME;COMPANY_NAME" "" ${version_list})
-
-  set(APP_NAME ${APP_APP_NAME}) # inconsistency in upstream
-  string(TOLOWER ${APP_APP_NAME} APP_NAME_LC)
-  set(COMPANY_NAME ${APP_COMPANY_NAME})
-  set(APP_VERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR})
-  if(APP_VERSION_TAG)
-    set(APP_VERSION ${APP_VERSION}-${APP_VERSION_TAG})
-  endif()
-  string(REPLACE "." "," FILE_VERSION ${APP_ADDON_API}.0)
-  string(TOLOWER ${APP_VERSION_TAG} APP_VERSION_TAG_LC)
-  file(STRINGS ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h guilib_version REGEX "^.*GUILIB_API_VERSION (.*)$")
-  string(REGEX REPLACE ".*\"(.*)\"" "\\1" guilib_version ${guilib_version})
-  file(STRINGS ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h guilib_version_min REGEX "^.*GUILIB_MIN_API_VERSION (.*)$")
-  string(REGEX REPLACE ".*\"(.*)\"" "\\1" guilib_version_min ${guilib_version_min})
-endmacro()
diff --git a/project/cmake/scripts/common/managestring.cmake b/project/cmake/scripts/common/managestring.cmake
deleted file mode 100644
index 7321f4c..0000000
--- a/project/cmake/scripts/common/managestring.cmake
+++ /dev/null
@@ -1,235 +0,0 @@
-# - Collection of String utility macros.
-# Defines the following macros:
-#   STRING_TRIM(var str [NOUNQUOTE])
-#   - Trim a string by removing the leading and trailing spaces,
-#     just like STRING(STRIP ...) in CMake 2.6 and later.
-#     This macro is needed as CMake 2.4 does not support STRING(STRIP ..)
-#     This macro also remove quote and double quote marks around the string,
-#     unless NOUNQUOTE is defined.
-#     * Parameters:
-#       + var: A variable that stores the result.
-#       + str: A string.
-#       + NOUNQUOTE: (Optional) do not remove the double quote mark around the string.
-#
-#   STRING_UNQUOTE(var str)
-#   - Remove double quote marks and quote marks around a string.
-#     If the string is not quoted, then it returns an empty string.
-#     * Parameters:
-#       + var: A variable that stores the result.
-#       + str: A string.
-#
-#   STRING_JOIN(var delimiter str_list [str...])
-#   - Concatenate strings, with delimiter inserted between strings.
-#     * Parameters:
-#       + var: A variable that stores the result.
-#       + str_list: A list of string.
-#       + str: (Optional) more string to be join.
-#
-#   STRING_SPLIT(var delimiter str [NOESCAPE_SEMICOLON])
-#   - Split a string into a list using a delimiter, which can be in 1 or more
-#     characters long.
-#     * Parameters:
-#       + var: A variable that stores the result.
-#       + delimiter: To separate a string.
-#       + str: A string.
-#       + NOESCAPE_SEMICOLON: (Optional) Do not escape semicolons.
-#
-
-IF(NOT DEFINED _MANAGE_STRING_CMAKE_)
-    SET(_MANAGE_STRING_CMAKE_ "DEFINED")
-
-    MACRO(STRING_TRIM var str)
-        SET(${var} "")
-        IF (NOT "${ARGN}" STREQUAL "NOUNQUOTE")
-            # Need not trim a quoted string.
-            STRING_UNQUOTE(_var "${str}")
-            IF(NOT _var STREQUAL "")
-                # String is quoted
-                SET(${var} "${_var}")
-            ENDIF(NOT _var STREQUAL "")
-        ENDIF(NOT "${ARGN}" STREQUAL "NOUNQUOTE")
-
-        IF(${var} STREQUAL "")
-            SET(_var_1 "${str}")
-            STRING(REGEX REPLACE  "^[ \t\r\n]+" "" _var_2 "${str}" )
-            STRING(REGEX REPLACE  "[ \t\r\n]+$" "" _var_3 "${_var_2}" )
-            SET(${var} "${_var_3}")
-        ENDIF(${var} STREQUAL "")
-    ENDMACRO(STRING_TRIM var str)
-
-    # Internal macro
-    # Variable cannot be escaped here, as variable is already substituted
-    # at the time it passes to this macro.
-    MACRO(STRING_ESCAPE var str)
-        # ';' and '\' are tricky, need to be encoded.
-        # '#' => '#H'
-        # '\' => '#B'
-        # ';' => '#S'
-        SET(_NOESCAPE_SEMICOLON "")
-        SET(_NOESCAPE_HASH "")
-
-        FOREACH(_arg ${ARGN})
-            IF(${_arg} STREQUAL "NOESCAPE_SEMICOLON")
-                SET(_NOESCAPE_SEMICOLON "NOESCAPE_SEMICOLON")
-            ELSEIF(${_arg} STREQUAL "NOESCAPE_HASH")
-                SET(_NOESCAPE_HASH "NOESCAPE_HASH")
-            ENDIF(${_arg} STREQUAL "NOESCAPE_SEMICOLON")
-        ENDFOREACH(_arg)
-
-        IF(_NOESCAPE_HASH STREQUAL "")
-            STRING(REGEX REPLACE "#" "#H" _ret "${str}")
-        ELSE(_NOESCAPE_HASH STREQUAL "")
-            SET(_ret "${str}")
-        ENDIF(_NOESCAPE_HASH STREQUAL "")
-
-        STRING(REGEX REPLACE "\\\\" "#B" _ret "${_ret}")
-        IF(_NOESCAPE_SEMICOLON STREQUAL "")
-            STRING(REGEX REPLACE ";" "#S" _ret "${_ret}")
-        ENDIF(_NOESCAPE_SEMICOLON STREQUAL "")
-        SET(${var} "${_ret}")
-    ENDMACRO(STRING_ESCAPE var str)
-
-    MACRO(STRING_UNESCAPE var str)
-        # '#B' => '\'
-        # '#H' => '#'
-        # '#D' => '$'
-        # '#S' => ';'
-        SET(_ESCAPE_VARIABLE "")
-        SET(_NOESCAPE_SEMICOLON "")
-        SET(_ret "${str}")
-        FOREACH(_arg ${ARGN})
-            IF(${_arg} STREQUAL "NOESCAPE_SEMICOLON")
-                SET(_NOESCAPE_SEMICOLON "NOESCAPE_SEMICOLON")
-            ELSEIF(${_arg} STREQUAL "ESCAPE_VARIABLE")
-                SET(_ESCAPE_VARIABLE "ESCAPE_VARIABLE")
-                STRING(REGEX REPLACE "#D" "$" _ret "${_ret}")
-            ENDIF(${_arg} STREQUAL "NOESCAPE_SEMICOLON")
-        ENDFOREACH(_arg)
-
-        STRING(REGEX REPLACE "#B" "\\\\" _ret "${_ret}")
-        IF(_NOESCAPE_SEMICOLON STREQUAL "")
-            # ';' => '#S'
-            STRING(REGEX REPLACE "#S" "\\\\;" _ret "${_ret}")
-        ELSE(_NOESCAPE_SEMICOLON STREQUAL "")
-            STRING(REGEX REPLACE "#S" ";" _ret "${_ret}")
-        ENDIF(_NOESCAPE_SEMICOLON STREQUAL "")
-
-        IF(NOT _ESCAPE_VARIABLE STREQUAL "")
-            # '#D' => '$'
-            STRING(REGEX REPLACE "#D" "$" _ret "${_ret}")
-        ENDIF(NOT _ESCAPE_VARIABLE STREQUAL "")
-        STRING(REGEX REPLACE "#H" "#" _ret "${_ret}")
-        SET(${var} "${_ret}")
-    ENDMACRO(STRING_UNESCAPE var str)
-
-
-    MACRO(STRING_UNQUOTE var str)
-        STRING_ESCAPE(_ret "${str}" ${ARGN})
-        IF(_ret MATCHES "^[ \t\r\n]+")
-            STRING(REGEX REPLACE "^[ \t\r\n]+" "" _ret "${_ret}")
-        ENDIF(_ret MATCHES "^[ \t\r\n]+")
-        IF(_ret MATCHES "^\"")
-            # Double quote
-            STRING(REGEX REPLACE "\"\(.*\)\"[ \t\r\n]*$" "\\1" _ret "${_ret}")
-        ELSEIF(_ret MATCHES "^'")
-            # Single quote
-            STRING(REGEX REPLACE "'\(.*\)'[ \t\r\n]*$" "\\1" _ret "${_ret}")
-        ELSE(_ret MATCHES "^\"")
-            SET(_ret "")
-        ENDIF(_ret MATCHES "^\"")
-
-        # Unencoding
-        STRING_UNESCAPE(${var} "${_ret}" ${ARGN})
-    ENDMACRO(STRING_UNQUOTE var str)
-
-    MACRO(STRING_JOIN var delimiter str_list)
-        SET(_ret "")
-        FOREACH(_str ${str_list})
-            IF(_ret STREQUAL "")
-                SET(_ret "${_str}")
-            ELSE(_ret STREQUAL "")
-                SET(_ret "${_ret}${delimiter}${_str}")
-            ENDIF(_ret STREQUAL "")
-        ENDFOREACH(_str ${str_list})
-
-        FOREACH(_str ${ARGN})
-            IF(_ret STREQUAL "")
-                SET(_ret "${_str}")
-            ELSE(_ret STREQUAL "")
-                SET(_ret "${_ret}${delimiter}${_str}")
-            ENDIF(_ret STREQUAL "")
-        ENDFOREACH(_str ${str_list})
-        SET(${var} "${_ret}")
-    ENDMACRO(STRING_JOIN var delimiter str_list)
-
-    MACRO(STRING_SPLIT var delimiter str)
-        SET(_max_tokens "")
-        SET(_NOESCAPE_SEMICOLON "")
-        SET(_ESCAPE_VARIABLE "")
-        FOREACH(_arg ${ARGN})
-            IF(${_arg} STREQUAL "NOESCAPE_SEMICOLON")
-                SET(_NOESCAPE_SEMICOLON "NOESCAPE_SEMICOLON")
-            ELSEIF(${_arg} STREQUAL "ESCAPE_VARIABLE")
-                SET(_ESCAPE_VARIABLE "ESCAPE_VARIABLE")
-            ELSE(${_arg} STREQUAL "NOESCAPE_SEMICOLON")
-                SET(_max_tokens ${_arg})
-            ENDIF(${_arg} STREQUAL "NOESCAPE_SEMICOLON")
-        ENDFOREACH(_arg)
-
-        IF(NOT _max_tokens)
-            SET(_max_tokens -1)
-        ENDIF(NOT _max_tokens)
-
-        STRING_ESCAPE(_str "${str}" ${_NOESCAPE_SEMICOLON} ${_ESCAPE_VARIABLE})
-        STRING_ESCAPE(_delimiter "${delimiter}" ${_NOESCAPE_SEMICOLON} ${_ESCAPE_VARIABLE})
-
-        SET(_str_list "")
-        SET(_token_count 0)
-        STRING(LENGTH "${_delimiter}" _de_len)
-
-        WHILE(NOT _token_count EQUAL _max_tokens)
-            MATH(EXPR _token_count ${_token_count}+1)
-            IF(_token_count EQUAL _max_tokens)
-                # Last token, no need splitting
-                SET(_str_list ${_str_list} "${_str}")
-            ELSE(_token_count EQUAL _max_tokens)
-                # in case encoded characters are delimiters
-                STRING(LENGTH "${_str}" _str_len)
-                SET(_index 0)
-                SET(_token "")
-                SET(_str_remain "")
-                MATH(EXPR _str_end ${_str_len}-${_de_len}+1)
-                SET(_bound "k")
-                WHILE(_index LESS _str_end)
-                    STRING(SUBSTRING "${_str}" ${_index} ${_de_len} _str_cursor)
-                    IF(_str_cursor STREQUAL _delimiter)
-                        # Get the token
-                        STRING(SUBSTRING "${_str}" 0 ${_index} _token)
-                        # Get the rest
-                        MATH(EXPR _rest_index ${_index}+${_de_len})
-                        MATH(EXPR _rest_len ${_str_len}-${_index}-${_de_len})
-                        STRING(SUBSTRING "${_str}" ${_rest_index} ${_rest_len} _str_remain)
-                        SET(_index ${_str_end})
-                    ELSE(_str_cursor STREQUAL _delimiter)
-                        MATH(EXPR _index ${_index}+1)
-                    ENDIF(_str_cursor STREQUAL _delimiter)
-                ENDWHILE(_index LESS _str_end)
-
-                IF(_str_remain STREQUAL "")
-                    # Meaning: end of string
-                    LIST(APPEND _str_list "${_str}")
-                    SET(_max_tokens ${_token_count})
-                ELSE(_str_remain STREQUAL "")
-                    LIST(APPEND _str_list "${_token}")
-                    SET(_str "${_str_remain}")
-                ENDIF(_str_remain STREQUAL "")
-            ENDIF(_token_count EQUAL _max_tokens)
-        ENDWHILE(NOT _token_count EQUAL _max_tokens)
-
-
-        # Unencoding
-        STRING_UNESCAPE(${var} "${_str_list}" ${_NOESCAPE_SEMICOLON} ${_ESCAPE_VARIABLE})
-    ENDMACRO(STRING_SPLIT var delimiter str)
-
-ENDIF(NOT DEFINED _MANAGE_STRING_CMAKE_)
-
diff --git a/project/cmake/scripts/common/pathsetup.cmake b/project/cmake/scripts/common/pathsetup.cmake
deleted file mode 100644
index 54b352d..0000000
--- a/project/cmake/scripts/common/pathsetup.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# This script configures installation paths
-
-include(${PROJECT_SOURCE_DIR}/scripts/${CORE_SYSTEM_NAME}/pathsetup.cmake)