diff options
| author | Vasyl Gello <vasek.gello@gmail.com> | 2022-04-13 21:54:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-13 21:54:13 +0300 |
| commit | 70d6b0c2e5a63e8076f7e9cf26331c2441ada371 (patch) | |
| tree | 2166c694d414dbc64f73a83dd371c914864a7c36 /cmake | |
| parent | b02d70f155eb2eed6b16619e447dde9b6d4a6f4c (diff) | |
| parent | 4d8502a9e83fa82ca1dc519e1570b723c14b0eb2 (diff) | |
Merge pull request #20506 from basilgello/kodiconfig-cmake-nexus
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 c8fc0c788c..331722cb56 100644 --- a/cmake/scripts/linux/Install.cmake +++ b/cmake/scripts/linux/Install.cmake @@ -173,8 +173,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 @@ -188,6 +187,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=''))" |