diff options
| author | wsnipex <wsnipex@a1.net> | 2016-09-07 14:42:52 +0200 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2016-09-07 14:42:52 +0200 |
| commit | cb2c5a5fcd663679faaa9ae72a9fc3bc0cf5c7a0 (patch) | |
| tree | 08ee14abb2702957a03a8f95ce17498a9feff235 /project | |
| parent | 638ce473f5a07d3f8c609be87252734d8e457a64 (diff) | |
[cmake] linux: install cmake files in arch independent dir
fixes KodiConfig.cmake not being found when building on a different cpu architecture
Diffstat (limited to 'project')
| -rw-r--r-- | project/cmake/KodiConfig.cmake.in | 2 | ||||
| -rw-r--r-- | project/cmake/scripts/linux/Install.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in index f25541bc7f..c02a68085a 100644 --- a/project/cmake/KodiConfig.cmake.in +++ b/project/cmake/KodiConfig.cmake.in @@ -18,7 +18,7 @@ endif() if(NOT WIN32) set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") endif() -list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@) +list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake) string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@") add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON) diff --git a/project/cmake/scripts/linux/Install.cmake b/project/cmake/scripts/linux/Install.cmake index 339d598a3c..9efda0a526 100644 --- a/project/cmake/scripts/linux/Install.cmake +++ b/project/cmake/scripts/linux/Install.cmake @@ -170,7 +170,7 @@ install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME}Config.cm ${CORE_SOURCE_DIR}/project/cmake/scripts/common/PrepareEnv.cmake ${CORE_SOURCE_DIR}/project/cmake/scripts/common/ProjectMacros.cmake ${CORE_SOURCE_DIR}/project/cmake/scripts/linux/PathSetup.cmake - DESTINATION ${libdir}/${APP_NAME_LC} + DESTINATION ${datarootdir}/${APP_NAME_LC}/cmake COMPONENT kodi-addon-dev) # Install kodi-audio-dev |