sync with upstream

1 files changed, 20 insertions, 2 deletions

diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmake.in
index 118d723..84b2563 100644
--- a/project/cmake/kodi-config.cmake.in
+++ b/project/cmake/kodi-config.cmake.in
@@ -1,11 +1,29 @@
-SET(KODI_INCLUDE_DIR @prefix@/include)
 SET(APP_NAME @APP_NAME@)
+SET(APP_NAME_LC @APP_NAME_LC@)
+SET(APP_NAME_UC @APP_NAME_UC@)
 SET(APP_VERSION_MAJOR @APP_VERSION_MAJOR@)
 SET(APP_VERSION_MINOR @APP_VERSION_MINOR@)
+IF(NOT @APP_NAME_UC@_PREFIX)
+  SET(@APP_NAME_UC@_PREFIX @APP_PREFIX@)
+ENDIF()
+IF(NOT @APP_NAME_UC@_INCLUDE_DIR)
+  SET(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@)
+ENDIF()
+IF(NOT @APP_NAME_UC@_LIB_DIR)
+  SET(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@)
+ENDIF()
 IF(NOT WIN32)
   SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
 ENDIF()
-LIST(APPEND CMAKE_MODULE_PATH @prefix@/lib/kodi)
+LIST(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@)
 ADD_DEFINITIONS(@ARCH_DEFINES@ -DBUILD_KODI_ADDON)
 
+if(NOT CORE_SYSTEM_NAME)
+  if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(CORE_SYSTEM_NAME "osx")
+  else()
+    string(TOLOWER ${CMAKE_SYSTEM_NAME} CORE_SYSTEM_NAME)
+  endif()
+endif()
+
 include(addon-helpers)