diff options
| author | Vasyl Gello <vasek.gello@gmail.com> | 2022-04-13 21:58:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-13 21:58:47 +0300 |
| commit | 96dd8a4e0bf73a30cbfd98316481470f45beef1c (patch) | |
| tree | aae8dd9a298a70c7b74672038e1240dbc88bff0a /cmake | |
| parent | fd3a2f045f8b59a1105716c9c7ddf23fb0216435 (diff) | |
| parent | 16d56082d7ca206fb58324af45a476aa0dfc8555 (diff) | |
Merge pull request #20507 from basilgello/kodiconfig-cmake-matrix
[BACKPORT]Install KodiConfig.cmake to arch-specific path
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/scripts/linux/Install.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake index c3ab33cd77..bf5e858a7a 100644 --- a/cmake/scripts/linux/Install.cmake +++ b/cmake/scripts/linux/Install.cmake @@ -172,8 +172,7 @@ install(FILES ${CORE_ADDON_BINDINGS_FILES} COMPONENT kodi-addon-dev) # Install kodi-addon-dev add-on bindings -install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME}Config.cmake - ${CMAKE_SOURCE_DIR}/cmake/scripts/common/AddonHelpers.cmake +install(FILES ${CMAKE_SOURCE_DIR}/cmake/scripts/common/AddonHelpers.cmake ${CMAKE_SOURCE_DIR}/cmake/scripts/common/AddOptions.cmake ${CMAKE_SOURCE_DIR}/cmake/scripts/common/ArchSetup.cmake ${CMAKE_SOURCE_DIR}/cmake/scripts/common/CheckCommits.cmake @@ -187,6 +186,11 @@ install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME}Config.cm ${CMAKE_SOURCE_DIR}/cmake/scripts/linux/PathSetup.cmake DESTINATION ${datarootdir}/${APP_NAME_LC}/cmake COMPONENT kodi-addon-dev) +# ${APP_NAME}Config.cmake contains architecture-specific paths so it +# should be installed in ${libdir}/${APP_NAME_LC}/${dir} +install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME}Config.cmake + DESTINATION ${libdir}/${APP_NAME_LC}/cmake + COMPONENT kodi-addon-dev) if(ENABLE_EVENTCLIENTS) execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix=''))" |