diff options
| author | Cristiano A. Silva <hudokkow@gmail.com> | 2016-06-01 22:07:15 +0100 |
|---|---|---|
| committer | Cristiano A. Silva <hudokkow@gmail.com> | 2016-06-01 22:07:15 +0100 |
| commit | f40551af018a6cfbe247ee6cc71ac63fd77c82f8 (patch) | |
| tree | 3c6d9acb1e0ba3d695232ca8e8d47542506b9267 /project | |
| parent | 8803a664f2a35e2113104eedc073c71d67d10610 (diff) | |
| parent | 42fd20ead0c717096e0c18a5b8c7fcb76d17587f (diff) | |
Merge pull request #9894 from hudokkow/cmake_kodiconfig
[cmake] KodiConfig.cmake is the name
Diffstat (limited to 'project')
| -rw-r--r-- | project/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | project/cmake/scripts/linux/Install.cmake | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index a61f156be4..3e4932639a 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -372,7 +372,7 @@ 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}) set(CXX11_SWITCH "-std=c++11") configure_file(${PROJECT_SOURCE_DIR}/KodiConfig.cmake.in - ${CORE_BUILD_DIR}/lib/${APP_NAME_LC}/${APP_NAME_LC}Config.cmake @ONLY) + ${CORE_BUILD_DIR}/lib/${APP_NAME_LC}/${APP_NAME}Config.cmake @ONLY) configure_file(${PROJECT_SOURCE_DIR}/scripts/common/AddonHelpers.cmake ${CORE_BUILD_DIR}/lib/${APP_NAME_LC}/AddonHelpers.cmake COPYONLY) configure_file(${PROJECT_SOURCE_DIR}/scripts/common/AddOptions.cmake diff --git a/project/cmake/scripts/linux/Install.cmake b/project/cmake/scripts/linux/Install.cmake index 44fba34fcd..109984d2a0 100644 --- a/project/cmake/scripts/linux/Install.cmake +++ b/project/cmake/scripts/linux/Install.cmake @@ -29,13 +29,14 @@ configure_file(${CORE_SOURCE_DIR}/tools/Linux/kodi-standalone.sh.in ${CORE_BUILD_DIR}/scripts/${APP_NAME_LC}-standalone @ONLY) # cmake config + set(APP_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/${APP_NAME_LC}) set(APP_PREFIX ${CMAKE_INSTALL_PREFIX}) set(APP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/${APP_NAME_LC}) set(CXX11_SWITCH "-std=c++11") configure_file(${PROJECT_SOURCE_DIR}/KodiConfig.cmake.in - ${CORE_BUILD_DIR}/scripts/${APP_NAME_LC}Config.cmake @ONLY) -install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME_LC}Config.cmake + ${CORE_BUILD_DIR}/scripts/${APP_NAME}Config.cmake @ONLY) +install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME}Config.cmake ${PROJECT_SOURCE_DIR}/scripts/common/AddOptions.cmake ${PROJECT_SOURCE_DIR}/scripts/common/AddonHelpers.cmake DESTINATION lib/${APP_NAME_LC}) |