FIX: [binary addons] parametrization of app name just fails

koying · Nov 15, 2016 · ce13aa8 · ce13aa8
1 parent db2e99b
commit ce13aa8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in
@@ -1,19 +1,19 @@
 set(APP_NAME @APP_NAME@)
 set(APP_NAME_LC @APP_NAME_LC@)
-set(APP_NAME_UC @APP_NAME_UC@)
+set(APP_NAME_UC KODI)
 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@)
+if(NOT KODI_PREFIX)
+  set(KODI_PREFIX @APP_PREFIX@)
 endif()
-if(NOT @APP_NAME_UC@_INCLUDE_DIR)
-  set(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@)
+if(NOT KODI_INCLUDE_DIR)
+  set(KODI_INCLUDE_DIR @APP_INCLUDE_DIR@)
 endif()
-if(NOT @APP_NAME_UC@_LIB_DIR)
-  set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@)
+if(NOT KODI_LIB_DIR)
+  set(KODI_LIB_DIR @APP_LIB_DIR@)
 endif()
-if(NOT @APP_NAME_UC@_DATA_DIR)
-  set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@)
+if(NOT KODI_DATA_DIR)
+  set(KODI_DATA_DIR @APP_DATA_DIR@)
 endif()
 if(NOT WIN32)
   set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")

diff --git a/project/cmake/scripts/common/AddonHelpers.cmake b/project/cmake/scripts/common/AddonHelpers.cmake
@@ -71,8 +71,8 @@ macro (build_addon target prefix libs)
     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}")
+    if(KODI_BUILD_DIR)
+      file(GENERATE OUTPUT ${KODI_BUILD_DIR}/addons/${target}/addon.xml CONTENT "${addon_file_conf}")
     endif()
   endif()
 
@@ -171,29 +171,29 @@ macro (build_addon target prefix libs)
   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")
+        if(CMAKE_INSTALL_PREFIX AND NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT CMAKE_INSTALL_PREFIX STREQUAL "${KODI_PREFIX}")
+          message(WARNING "CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} differs from ${APP_NAME} prefix, changing to ${KODI_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")
+        if(CMAKE_INSTALL_LIBDIR AND NOT CMAKE_INSTALL_LIBDIR STREQUAL "${KODI_LIB_DIR}")
+          message(WARNING "CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR} differs from ${APP_NAME} libdir, changing to ${KODI_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")
+        if(CMAKE_INSTALL_DATADIR AND NOT CMAKE_INSTALL_DATADIR STREQUAL "${KODI_DATA_DIR}")
+          message(WARNING "CMAKE_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR} differs from ${APP_NAME} datadir, changing to ${KODI_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)
+        set(CMAKE_INSTALL_PREFIX "${KODI_PREFIX}" CACHE PATH "${APP_NAME} install prefix" FORCE)
+        set(CMAKE_INSTALL_LIBDIR "${KODI_LIB_DIR}" CACHE PATH "${APP_NAME} install libdir" FORCE)
+        set(CMAKE_INSTALL_DATADIR "${KODI_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}")
+          set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/kodi")
         endif()
         if(NOT CMAKE_INSTALL_DATADIR)
-          set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/share/${APP_NAME_LC}")
+          set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/share/kodi")
         endif()
       endif()
     else()
-      set(CMAKE_INSTALL_LIBDIR "lib/${APP_NAME_LC}")
-      set(CMAKE_INSTALL_DATADIR "share/${APP_NAME_LC}")
+      set(CMAKE_INSTALL_LIBDIR "lib/kodi")
+      set(CMAKE_INSTALL_DATADIR "share/kodi")
     endif()
     if(${prefix}_SOURCES)
       install(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target})
@@ -211,25 +211,25 @@ macro (build_addon target prefix libs)
       install(DIRECTORY ${${prefix}_CUSTOM_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons/${target}/resources)
     endif()
   endif()
-  if(${APP_NAME_UC}_BUILD_DIR)
+  if(KODI_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)
+                                 ${KODI_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)
+        configure_file(${file} ${KODI_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})
+                                   ${KODI_BUILD_DIR}/addons/${target}/${LIBRARY_FILENAME})
   endif()
 endmacro()
 
@@ -263,6 +263,6 @@ 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)
+if(KODI_BUILD_DIR)
+  list(APPEND CMAKE_PREFIX_PATH ${KODI_BUILD_DIR}/build)
 endif()
diff --git a/project/cmake/scripts/common/PrepareEnv.cmake b/project/cmake/scripts/common/PrepareEnv.cmake
@@ -9,17 +9,17 @@ 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 ${DEPENDS_PATH}/lib/kodi)
 if(NOT EXISTS "${APP_LIB_DIR}/")
   file(MAKE_DIRECTORY ${APP_LIB_DIR})
 endif()
 
-set(APP_DATA_DIR ${DEPENDS_PATH}/share/${APP_NAME_LC})
+set(APP_DATA_DIR ${DEPENDS_PATH}/share/kodi)
 if(NOT EXISTS "${APP_DATA_DIR}/")
   file(MAKE_DIRECTORY ${APP_DATA_DIR})
 endif()
 
-set(APP_INCLUDE_DIR ${DEPENDS_PATH}/include/${APP_NAME_LC})
+set(APP_INCLUDE_DIR ${DEPENDS_PATH}/include/kodi)
 if(NOT EXISTS "${APP_INCLUDE_DIR}/")
   file(MAKE_DIRECTORY ${APP_INCLUDE_DIR})
 endif()