diff options
| author | h.udo <hudokkow@gmail.com> | 2016-06-29 13:15:37 +0100 |
|---|---|---|
| committer | h.udo <hudokkow@gmail.com> | 2016-07-19 11:09:21 +0100 |
| commit | 868c8b863901f20b728c6632cb4b4d71b051a10c (patch) | |
| tree | 67d0857181dc411b281ec2017f681d01007f75a3 | |
| parent | 2cac3e385eda993bc3557b10f37fcc8673336aa5 (diff) | |
[cmake] Nuke legacy XBMCConfig.cmake
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | project/cmake/XBMCConfig.cmake.in | 4 | ||||
| -rw-r--r-- | project/cmake/scripts/common/PrepareEnv.cmake | 3 |
4 files changed, 0 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 0d2b408835..42b3b8b356 100644 --- a/.gitignore +++ b/.gitignore @@ -227,7 +227,6 @@ lib/cpluff/stamp-h1 # /project/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 d498f958b8..4943d7fb7f 100644 --- a/configure.ac +++ b/configure.ac @@ -2216,7 +2216,6 @@ OUTPUT_FILES="Makefile \ xbmc/platform/darwin/osx/Info.plist \ xbmc/platform/darwin/ios/Info.plist \ 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 \ diff --git a/project/cmake/XBMCConfig.cmake.in b/project/cmake/XBMCConfig.cmake.in deleted file mode 100644 index 73d1c9c3a5..0000000000 --- a/project/cmake/XBMCConfig.cmake.in +++ /dev/null @@ -1,4 +0,0 @@ -message(WARNING "find_package(xbmc) has been deprecated, please use find_package(kodi)") - -find_package(kodi REQUIRED) -set(XBMC_INCLUDE_DIR ${KODI_INCLUDE_DIR})
\ No newline at end of file diff --git a/project/cmake/scripts/common/PrepareEnv.cmake b/project/cmake/scripts/common/PrepareEnv.cmake index bf258d5c30..2d18602b42 100644 --- a/project/cmake/scripts/common/PrepareEnv.cmake +++ b/project/cmake/scripts/common/PrepareEnv.cmake @@ -45,9 +45,6 @@ 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 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 file(STRINGS ${CORE_SOURCE_DIR}/xbmc/addons/addon-bindings.mk bindings) |