diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | project/cmake/installdata/cmake-files.txt | 1 | ||||
| -rw-r--r-- | project/cmake/scripts/common/PathSetup.cmake | 3 | ||||
| -rw-r--r-- | project/cmake/scripts/linux/Install.cmake | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index 3e4932639a..3d92e8b2b7 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -66,7 +66,7 @@ include(scripts/common/AddOptions.cmake) include(scripts/common/ArchSetup.cmake) include(scripts/common/Macros.cmake) include(scripts/common/ProjectMacros.cmake) -include(scripts/common/PathSetup.cmake) +include(scripts/${CORE_SYSTEM_NAME}/PathSetup.cmake) include(ExternalProject) core_find_git_rev() diff --git a/project/cmake/installdata/cmake-files.txt b/project/cmake/installdata/cmake-files.txt index 8682bd6844..7ae9a8da6c 100644 --- a/project/cmake/installdata/cmake-files.txt +++ b/project/cmake/installdata/cmake-files.txt @@ -7,6 +7,5 @@ project/cmake/scripts/common/GenerateVersionedFiles.cmake project/cmake/scripts/common/GeneratorSetup.cmake project/cmake/scripts/common/HandleDepends.cmake project/cmake/scripts/common/Macros.cmake -project/cmake/scripts/common/PathSetup.cmake project/cmake/scripts/common/PrepareEnv.cmake project/cmake/scripts/common/ProjectMacros.cmake diff --git a/project/cmake/scripts/common/PathSetup.cmake b/project/cmake/scripts/common/PathSetup.cmake deleted file mode 100644 index 47b1a9625a..0000000000 --- a/project/cmake/scripts/common/PathSetup.cmake +++ /dev/null @@ -1,3 +0,0 @@ -# This script configures installation paths - -include(${PROJECT_SOURCE_DIR}/scripts/${CORE_SYSTEM_NAME}/PathSetup.cmake) diff --git a/project/cmake/scripts/linux/Install.cmake b/project/cmake/scripts/linux/Install.cmake index 109984d2a0..94aa5b93ee 100644 --- a/project/cmake/scripts/linux/Install.cmake +++ b/project/cmake/scripts/linux/Install.cmake @@ -39,9 +39,9 @@ configure_file(${PROJECT_SOURCE_DIR}/KodiConfig.cmake.in 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 + ${PROJECT_SOURCE_DIR}/scripts/linux/PathSetup.cmake DESTINATION lib/${APP_NAME_LC}) install(FILES ${cmake_files} DESTINATION ${libdir}/${APP_NAME_LC}) - install(TARGETS ${APP_NAME_LC} DESTINATION ${libdir}/${APP_NAME_LC}) if(ENABLE_X11 AND XRANDR_FOUND) install(TARGETS ${APP_NAME_LC}-xrandr DESTINATION ${libdir}/${APP_NAME_LC}) |