diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-04-29 16:10:04 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-04-29 16:13:16 +1000 |
| commit | 50ca4ef6c4826215247f5fe19201717b6c2e7636 (patch) | |
| tree | d9d228e9ce6c720cf70d9b9260255b433534e42b | |
| parent | c94935f97e5134bd68b86fced8225b9ea319fc96 (diff) | |
[cmake] Tools/depends platform toolchain propagate tarball dir
for tools/depends platforms, we already set tarball dir as part of the configure
script. Lets propagate this into the Toolchain file so we dont have to explicitly
set -DTARBALL_DIR for those platforms.
The single downside to this, is you cant override the toolchain option. However the
reality is, you should override the configure script using --with--tarballs
| -rw-r--r-- | cmake/scripts/darwin_embedded/ArchSetup.cmake | 4 | ||||
| -rw-r--r-- | cmake/scripts/osx/ArchSetup.cmake | 4 | ||||
| -rw-r--r-- | tools/depends/target/Toolchain.cmake.in | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/cmake/scripts/darwin_embedded/ArchSetup.cmake b/cmake/scripts/darwin_embedded/ArchSetup.cmake index c9741a586f..8368413b12 100644 --- a/cmake/scripts/darwin_embedded/ArchSetup.cmake +++ b/cmake/scripts/darwin_embedded/ArchSetup.cmake @@ -49,10 +49,6 @@ set(CMAKE_XCODE_ATTRIBUTE_INLINES_ARE_PRIVATE_EXTERN OFF) set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN OFF) set(CMAKE_XCODE_ATTRIBUTE_COPY_PHASE_STRIP OFF) -if(NOT TARBALL_DIR) - set(TARBALL_DIR "/Users/Shared/xbmc-depends/xbmc-tarballs") -endif() - include(cmake/scripts/darwin/Macros.cmake) enable_arc() diff --git a/cmake/scripts/osx/ArchSetup.cmake b/cmake/scripts/osx/ArchSetup.cmake index ec72737894..4e89214f40 100644 --- a/cmake/scripts/osx/ArchSetup.cmake +++ b/cmake/scripts/osx/ArchSetup.cmake @@ -29,10 +29,6 @@ if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64" AND set(HOST_CAN_EXECUTE_TARGET TRUE) endif() -if(NOT TARBALL_DIR) - set(TARBALL_DIR "/Users/Shared/xbmc-depends/xbmc-tarballs") -endif() - set(CMAKE_OSX_ARCHITECTURES ${CPU}) if(CMAKE_GENERATOR STREQUAL Xcode) diff --git a/tools/depends/target/Toolchain.cmake.in b/tools/depends/target/Toolchain.cmake.in index 5586fb7828..18dddd6a8f 100644 --- a/tools/depends/target/Toolchain.cmake.in +++ b/tools/depends/target/Toolchain.cmake.in @@ -1,6 +1,8 @@ set(DEPENDS_PATH "@prefix@/@deps_dir@") set(NATIVEPREFIX "@prefix@/@tool_dir@") +set(TARBALL_DIR "@use_tarballs@") + set(OS "@platform_os@") set(CMAKE_SYSTEM_PROCESSOR @host_cpu@) set(CPU "@use_cpu@") |