From bdbd0af58fd4e29688b1b13cc4707a19ceba8f62 Mon Sep 17 00:00:00 2001 From: "h.udo" Date: Wed, 6 Apr 2016 12:00:05 +0100 Subject: [cmake][linux] Install missing *.cmake files --- project/cmake/CMakeLists.txt | 5 +++++ project/cmake/installdata/cmake-files.txt | 13 +++++++++++++ project/cmake/scripts/linux/install.cmake | 11 ++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 project/cmake/installdata/cmake-files.txt (limited to 'project') diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index 8def4fc829..d082599761 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -252,6 +252,11 @@ foreach(binding ${bindings}) list(APPEND addon_bindings ${CORE_SOURCE_DIR}/${binding}) endforeach() +file(STRINGS ${PROJECT_SOURCE_DIR}/installdata/cmake-files.txt cmakefiles) +foreach(cmakefile ${cmakefiles}) + list(APPEND cmake_files ${CORE_SOURCE_DIR}/${cmakefile}) +endforeach() + add_subdirectory(${CORE_SOURCE_DIR}/lib/gtest ${CORE_BUILD_DIR}/gtest EXCLUDE_FROM_ALL) # Subdirs diff --git a/project/cmake/installdata/cmake-files.txt b/project/cmake/installdata/cmake-files.txt new file mode 100644 index 0000000000..8dda8cdb9e --- /dev/null +++ b/project/cmake/installdata/cmake-files.txt @@ -0,0 +1,13 @@ +project/cmake/scripts/common/addon-helpers.cmake +project/cmake/scripts/common/addoptions.cmake +project/cmake/scripts/common/archsetup.cmake +project/cmake/scripts/common/checkcommits.cmake +project/cmake/scripts/common/check_target_platform.cmake +project/cmake/scripts/common/generateversionedfiles.cmake +project/cmake/scripts/common/generatorsetup.cmake +project/cmake/scripts/common/handle-depends.cmake +project/cmake/scripts/common/macros.cmake +project/cmake/scripts/common/managestring.cmake +project/cmake/scripts/common/pathsetup.cmake +project/cmake/scripts/common/prepare-env.cmake +project/cmake/scripts/common/projectmacros.cmake diff --git a/project/cmake/scripts/linux/install.cmake b/project/cmake/scripts/linux/install.cmake index e0c91f052a..fff4c56883 100644 --- a/project/cmake/scripts/linux/install.cmake +++ b/project/cmake/scripts/linux/install.cmake @@ -14,6 +14,9 @@ else() set(USE_OPENGLES 0) endif() +configure_file(${CORE_SOURCE_DIR}/project/cmake/${APP_NAME_LC}-config.cmake.in + ${CORE_BUILD_DIR}/${APP_NAME_LC}-config.cmake @ONLY) + configure_file(${CORE_SOURCE_DIR}/tools/Linux/kodi.sh.in ${CORE_BUILD_DIR}/scripts/${APP_NAME_LC} @ONLY) configure_file(${CORE_SOURCE_DIR}/tools/Linux/kodi-standalone.sh.in @@ -32,8 +35,14 @@ if(NOT EXISTS ${includedir}/xbmc) install(CODE "execute_process (COMMAND ln -sf ${APP_NAME_LC}/ xbmc WORKING_DIRECTORY ${includedir})") endif() -install(FILES ${cmake-files} +install(FILES ${cmake_files} DESTINATION ${libdir}/kodi) +install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${APP_NAME_LC}-config.cmake + DESTINATION ${libdir}/${APP_NAME_LC}) +install(FILES ${CORE_SOURCE_DIR}/project/cmake/xbmc-config.cmake.in + RENAME xbmc-config.cmake + DESTINATION ${libdir}/${APP_NAME_LC}) + install(PROGRAMS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME_LC} ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME_LC}-standalone DESTINATION ${bindir}) -- cgit v1.2.3