diff options
| author | jenkins4kodi <jenkins4kodi@users.noreply.github.com> | 2016-10-20 08:49:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-20 08:49:13 +0200 |
| commit | 0c92390d2c86dbde308d43d5b801d65a3ecb7ef5 (patch) | |
| tree | d42044cd6297ee155da68726d367266e844d30fc | |
| parent | 8b6a24fe6c6ca884812a88b0d5e7145e407de115 (diff) | |
| parent | 1af833651209c0fb6adfb944f5b7c929f025cd4b (diff) | |
Merge pull request #10732 from Memphiz/cmake_fix_binaddons
| -rw-r--r-- | project/cmake/addons/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/depends/target/Toolchain_binaddons.cmake.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/project/cmake/addons/CMakeLists.txt b/project/cmake/addons/CMakeLists.txt index b70778598a..b57b0fde11 100644 --- a/project/cmake/addons/CMakeLists.txt +++ b/project/cmake/addons/CMakeLists.txt @@ -206,6 +206,7 @@ if(NOT addons) -DCMAKE_INSTALL_PREFIX:PATH=${ADDONS_DEFINITION_DIR} -DBUILD_DIR:PATH=${BOOTSTRAP_BUILD_DIR} -DADDONS_TO_BUILD:STRING=${ADDONS_TO_BUILD_STR} + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} WORKING_DIRECTORY ${BOOTSTRAP_BUILD_DIR}) # execute the generated bootstrap buildsystem diff --git a/tools/depends/target/Toolchain_binaddons.cmake.in b/tools/depends/target/Toolchain_binaddons.cmake.in index 98494b49fe..a5101803f8 100644 --- a/tools/depends/target/Toolchain_binaddons.cmake.in +++ b/tools/depends/target/Toolchain_binaddons.cmake.in @@ -16,6 +16,7 @@ elseif("${OS}" STREQUAL "osx") set(CORE_SYSTEM_NAME osx) elseif("${OS}" STREQUAL "ios") set(CORE_SYSTEM_NAME ios) + set(CMAKE_SYSTEM_NAME Darwin) elseif("${PLATFORM}" STREQUAL "raspberry-pi") set(CORE_SYSTEM_NAME rbpi) list(APPEND CMAKE_FIND_ROOT_PATH @use_firmware@/opt/vc) |