diff options
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | cmake/scripts/common/PrepareEnv.cmake | 8 | ||||
| -rw-r--r-- | cmake/scripts/linux/Install.cmake | 2 | ||||
| -rw-r--r-- | xbmc/addons/AddonBindings.cmake | 1 |
4 files changed, 8 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b28633bc7..c3a91b5486 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -422,14 +422,9 @@ endif() # Prepare add-on build env include(${CORE_SOURCE_DIR}/xbmc/addons/AddonBindings.cmake) -file(COPY ${CORE_ADDON_BINDINGS_FILES} ${CORE_ADDON_BINDINGS_DIRS}/ DESTINATION ${CORE_BUILD_DIR}/include/${APP_NAME_LC}) -file(GLOB_RECURSE ADDON_HEADERS - RELATIVE ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi - ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/*.h) -foreach(header ${ADDON_HEADERS}) - configure_file(${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/${header} - ${CORE_BUILD_DIR}/include/kodi/${header} COPYONLY) -endforeach() +file(COPY ${CORE_ADDON_BINDINGS_FILES} ${CORE_ADDON_BINDINGS_DIRS}/ + DESTINATION ${CORE_BUILD_DIR}/include/${APP_NAME_LC} + REGEX ".txt" EXCLUDE) set(APP_LIB_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/${APP_NAME_LC}) set(APP_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include/${APP_NAME_LC}) diff --git a/cmake/scripts/common/PrepareEnv.cmake b/cmake/scripts/common/PrepareEnv.cmake index 401932d0a5..1426148880 100644 --- a/cmake/scripts/common/PrepareEnv.cmake +++ b/cmake/scripts/common/PrepareEnv.cmake @@ -40,13 +40,11 @@ file(COPY ${CORE_SOURCE_DIR}/cmake/scripts/common/AddonHelpers.cmake ${CORE_SOURCE_DIR}/cmake/scripts/common/AddOptions.cmake DESTINATION ${APP_LIB_DIR}) -# copy standard add-on include files -file(COPY ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/ - DESTINATION ${APP_INCLUDE_DIR} REGEX ".txt" EXCLUDE) - ### copy all the addon binding header files to include/kodi include(${CORE_SOURCE_DIR}/xbmc/addons/AddonBindings.cmake) -file(COPY ${CORE_ADDON_BINDINGS_FILES} ${CORE_ADDON_BINDINGS_DIRS}/ DESTINATION ${APP_INCLUDE_DIR}) +file(COPY ${CORE_ADDON_BINDINGS_FILES} ${CORE_ADDON_BINDINGS_DIRS}/ + DESTINATION ${APP_INCLUDE_DIR} + REGEX ".txt" EXCLUDE) ### processing additional tools required by the platform if(EXISTS ${CORE_SOURCE_DIR}/cmake/scripts/${CORE_SYSTEM_NAME}/tools/) diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake index 1e9188f04b..10b2c32951 100644 --- a/cmake/scripts/linux/Install.cmake +++ b/cmake/scripts/linux/Install.cmake @@ -147,7 +147,7 @@ endif() # Install kodi-addon-dev headers include(${CMAKE_SOURCE_DIR}/xbmc/addons/AddonBindings.cmake) -install(DIRECTORY ${CMAKE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/ ${CORE_ADDON_BINDINGS_DIRS}/ +install(DIRECTORY ${CORE_ADDON_BINDINGS_DIRS}/ DESTINATION ${includedir}/${APP_NAME_LC} COMPONENT kodi-addon-dev REGEX ".txt" EXCLUDE) diff --git a/xbmc/addons/AddonBindings.cmake b/xbmc/addons/AddonBindings.cmake index 364f5cae12..213b3e2782 100644 --- a/xbmc/addons/AddonBindings.cmake +++ b/xbmc/addons/AddonBindings.cmake @@ -11,5 +11,6 @@ set(CORE_ADDON_BINDINGS_FILES ) set(CORE_ADDON_BINDINGS_DIRS + ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/ ${CORE_SOURCE_DIR}/xbmc/cores/VideoPlayer/Interface/Addon ) |