diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | project/cmake/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | project/cmake/KodiConfig.cmake.in (renamed from project/cmake/kodi-config.cmake.in) | 0 | ||||
| -rw-r--r-- | project/cmake/XBMCConfig.cmake.in (renamed from project/cmake/xbmc-config.cmake.in) | 0 | ||||
| -rw-r--r-- | project/cmake/scripts/common/PrepareEnv.cmake | 8 | ||||
| -rw-r--r-- | project/cmake/scripts/freebsd/Install.cmake | 2 | ||||
| -rw-r--r-- | project/cmake/scripts/linux/Install.cmake | 6 |
8 files changed, 15 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore index 873d3770c9..838a08b654 100644 --- a/.gitignore +++ b/.gitignore @@ -223,8 +223,8 @@ lib/cpluff/stamp-h1 /project/output # /project/cmake -/project/cmake/kodi-config.cmake -/project/cmake/xbmc-config.cmake +/project/cmake/KodiConfig.cmake +/project/cmake/XBMCConfig.cmake /project/cmake/addons/*.error /project/cmake/addons/.failure /project/cmake/addons/.success diff --git a/configure.ac b/configure.ac index 4221e5b5a4..8b330b0ceb 100644 --- a/configure.ac +++ b/configure.ac @@ -2200,8 +2200,8 @@ OUTPUT_FILES="Makefile \ tools/darwin/packaging/migrate_to_kodi_ios.sh \ xbmc/platform/darwin/osx/Info.plist \ xbmc/platform/darwin/ios/Info.plist \ - project/cmake/kodi-config.cmake \ - project/cmake/xbmc-config.cmake \ + project/cmake/KodiConfig.cmake \ + project/cmake/XBMCConfig.cmake \ tools/android/packaging/xbmc/AndroidManifest.xml \ tools/android/packaging/Makefile \ tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java \ @@ -2228,7 +2228,7 @@ OUTPUT_FILES="$OUTPUT_FILES \ xbmc/interfaces/python/Makefile \ xbmc/interfaces/python/test/Makefile" -# needed for kodi-config.cmake +# needed for KodiConfig.cmake if echo "$libdir" | grep -q '${exec_prefix}'; then if test "${prefix}" = "NONE" || test "${prefix}" = ""; then prefix="/usr/local" diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index ba0039c00b..7800c0d983 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -372,8 +372,8 @@ endforeach() 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}/kodi-config.cmake.in - ${CORE_BUILD_DIR}/lib/${APP_NAME_LC}/${APP_NAME_LC}-config.cmake @ONLY) +configure_file(${PROJECT_SOURCE_DIR}/KodiConfig.cmake.in + ${CORE_BUILD_DIR}/lib/${APP_NAME_LC}/${APP_NAME_LC}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/kodi-config.cmake.in b/project/cmake/KodiConfig.cmake.in index d6b60c2e1b..d6b60c2e1b 100644 --- a/project/cmake/kodi-config.cmake.in +++ b/project/cmake/KodiConfig.cmake.in diff --git a/project/cmake/xbmc-config.cmake.in b/project/cmake/XBMCConfig.cmake.in index 73d1c9c3a5..73d1c9c3a5 100644 --- a/project/cmake/xbmc-config.cmake.in +++ b/project/cmake/XBMCConfig.cmake.in diff --git a/project/cmake/scripts/common/PrepareEnv.cmake b/project/cmake/scripts/common/PrepareEnv.cmake index ffe14530ab..fadca482d9 100644 --- a/project/cmake/scripts/common/PrepareEnv.cmake +++ b/project/cmake/scripts/common/PrepareEnv.cmake @@ -56,16 +56,16 @@ if(NOT WIN32) endif() endif() -# generate the proper kodi-config.cmake file -configure_file(${CORE_SOURCE_DIR}/project/cmake/kodi-config.cmake.in ${APP_LIB_DIR}/kodi-config.cmake @ONLY) +# generate the proper KodiConfig.cmake file +configure_file(${CORE_SOURCE_DIR}/project/cmake/KodiConfig.cmake.in ${APP_LIB_DIR}/KodiConfig.cmake @ONLY) # copy cmake helpers to lib/kodi file(COPY ${CORE_SOURCE_DIR}/project/cmake/scripts/common/AddonHelpers.cmake ${CORE_SOURCE_DIR}/project/cmake/scripts/common/AddOptions.cmake DESTINATION ${APP_LIB_DIR}) -# generate xbmc-config.cmake for backwards compatibility to xbmc -configure_file(${CORE_SOURCE_DIR}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY) +# generate XBMCConfig.cmake for backwards compatibility to xbmc +configure_file(${CORE_SOURCE_DIR}/project/cmake/XBMCConfig.cmake.in ${XBMC_LIB_DIR}/XBMCConfig.cmake @ONLY) ### copy all the addon binding header files to include/kodi # parse addon-bindings.mk to get the list of header files to copy diff --git a/project/cmake/scripts/freebsd/Install.cmake b/project/cmake/scripts/freebsd/Install.cmake index 8247416c7b..4d95d96475 100644 --- a/project/cmake/scripts/freebsd/Install.cmake +++ b/project/cmake/scripts/freebsd/Install.cmake @@ -8,7 +8,7 @@ configure_file(${CORE_SOURCE_DIR}/tools/Linux/xbmc-standalone.sh.in install(TARGETS xbmc-xrandr DESTINATION lib/xbmc) install(FILES ${addon_bindings} DESTINATION include/xbmc) -install(FILES ${cmake_files} ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/modules/xbmc-config.cmake +install(FILES ${cmake_files} ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/modules/XBMCConfig.cmake DESTINATION lib/xbmc) install(PROGRAMS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/xbmc ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/xbmc-standalone diff --git a/project/cmake/scripts/linux/Install.cmake b/project/cmake/scripts/linux/Install.cmake index 3124417aff..a3267914fe 100644 --- a/project/cmake/scripts/linux/Install.cmake +++ b/project/cmake/scripts/linux/Install.cmake @@ -33,9 +33,9 @@ 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}/kodi-config.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 +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 ${PROJECT_SOURCE_DIR}/scripts/common/AddOptions.cmake ${PROJECT_SOURCE_DIR}/scripts/common/AddonHelpers.cmake DESTINATION lib/${APP_NAME_LC}) |