diff options
| author | wsnipex <wsnipex@a1.net> | 2015-04-06 14:21:40 +0200 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2015-04-09 11:02:27 +0200 |
| commit | d30fb060bda2981e34d49a8108509ab192939e31 (patch) | |
| tree | 784d9d2a188517f543004821e840181c889dcf4e /project | |
| parent | d99ca917893706a01d08125ccb7a6dea4f4cae26 (diff) | |
[configure] properly set multi arch kodi libdir in kodi-config.cmake
Diffstat (limited to 'project')
| -rw-r--r-- | project/cmake/kodi-config.cmake.in | 2 | ||||
| -rw-r--r-- | project/cmake/scripts/common/prepare-env.cmake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmake.in index 118d723cab..bd7065c009 100644 --- a/project/cmake/kodi-config.cmake.in +++ b/project/cmake/kodi-config.cmake.in @@ -5,7 +5,7 @@ SET(APP_VERSION_MINOR @APP_VERSION_MINOR@) IF(NOT WIN32) SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") ENDIF() -LIST(APPEND CMAKE_MODULE_PATH @prefix@/lib/kodi) +LIST(APPEND CMAKE_MODULE_PATH @APP_LIBDIR@/@APP_NAME_LC@) ADD_DEFINITIONS(@ARCH_DEFINES@ -DBUILD_KODI_ADDON) include(addon-helpers) diff --git a/project/cmake/scripts/common/prepare-env.cmake b/project/cmake/scripts/common/prepare-env.cmake index 3413c4519f..5e773e21d6 100644 --- a/project/cmake/scripts/common/prepare-env.cmake +++ b/project/cmake/scripts/common/prepare-env.cmake @@ -12,6 +12,7 @@ if(EXISTS "${APP_ROOT}/version.txt") set(${name} "${value}") endif() endforeach() + string(TOLOWER ${APP_NAME} APP_NAME_LC) endif() # bail if we can't parse versions @@ -49,8 +50,9 @@ if(NOT WIN32) endif() endif() -# kodi-config.cmake.in (further down) expects a "prefix" variable +# kodi-config.cmake.in (further down) expects "prefix" and "APP_LIBDIR" variables get_filename_component(prefix "${DEPENDS_PATH}" ABSOLUTE) +set(APP_LIBDIR "${prefix}/lib") # generate the proper kodi-config.cmake file configure_file(${APP_ROOT}/project/cmake/kodi-config.cmake.in ${KODI_LIB_DIR}/kodi-config.cmake @ONLY) |