diff options
| author | montellese <montellese@kodi.tv> | 2015-07-21 22:12:55 +0200 |
|---|---|---|
| committer | montellese <montellese@kodi.tv> | 2015-08-01 16:12:46 +0200 |
| commit | 97976cb8ebb229a8f6f8a1783f7af49dc26f88ca (patch) | |
| tree | 84698081f4fa237d96d874d707f3ead8194b354e | |
| parent | 06f4d3c7e12d71aba49a638f2973a4871ad051f1 (diff) | |
cmake: rename "darwin" to "osx" in CORE_SYSTEM_NAME
| -rw-r--r-- | project/cmake/addons/README | 2 | ||||
| -rw-r--r-- | project/cmake/platform/osx/defines.txt (renamed from project/cmake/platform/darwin/defines.txt) | 0 | ||||
| -rw-r--r-- | tools/depends/target/Toolchain_binaddons.cmake.in | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/project/cmake/addons/README b/project/cmake/addons/README index 8fe53fd948..b4d3fe7ac6 100644 --- a/project/cmake/addons/README +++ b/project/cmake/addons/README @@ -22,7 +22,7 @@ are: * platforms.txt: List of platforms to build an addon for (or "all"). It is also supported to specify negated platforms with a leading exclamation mark (i), e.g. "!windows". - Available platforms are: linux, windows, darwin, ios, android, rbpi + Available platforms are: linux, windows, osx, ios, android, rbpi, freebsd The buildsystem uses the following variables (which can be passed into it when executing cmake with the -D<variable-name>=<value> option) to e.g. access diff --git a/project/cmake/platform/darwin/defines.txt b/project/cmake/platform/osx/defines.txt index 33b009e3a7..33b009e3a7 100644 --- a/project/cmake/platform/darwin/defines.txt +++ b/project/cmake/platform/osx/defines.txt diff --git a/tools/depends/target/Toolchain_binaddons.cmake.in b/tools/depends/target/Toolchain_binaddons.cmake.in index cdc2fe4f6c..0de04c4557 100644 --- a/tools/depends/target/Toolchain_binaddons.cmake.in +++ b/tools/depends/target/Toolchain_binaddons.cmake.in @@ -12,6 +12,8 @@ set(CMAKE_FIND_ROOT_PATH @CMAKE_FIND_ROOT_PATH@) if("${OS}" STREQUAL "android") set(CORE_SYSTEM_NAME android) list(APPEND CMAKE_FIND_ROOT_PATH @use_toolchain@/sysroot/usr) +elseif("${OS}" STREQUAL "osx") + set(CORE_SYSTEM_NAME osx) elseif("${OS}" STREQUAL "ios") set(CORE_SYSTEM_NAME ios) elseif("${PLATFORM}" STREQUAL "raspberry-pi") |