diff options
| author | wsnipex <wsnipex@a1.net> | 2018-06-11 13:33:41 +0200 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2018-06-11 13:33:41 +0200 |
| commit | 91e0de19bc55d3306a247116b926dabd0327f413 (patch) | |
| tree | ccbc9f948d25104a4e37b96c64d777cfb800d074 /tools | |
| parent | 6a0ad8c27cf8f41a368475c4f7d4ba9602542dc6 (diff) | |
[cmake] ffmpeg: remove workaround for ccache, pass the options instead
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index 1a16000d5f..4494a26128 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -4,18 +4,7 @@ cmake_minimum_required(VERSION 2.8) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) -# ENABLE_CCACHE can have the following values ON|OFF|AUTO -# During initial kodi project generation the forwarded ENABLE_CCACHE is empty, if ENABLE_CCACHE wasn't explicitly set. -# This happens as FindFFmpeg is called before core_optional_dep(CCache) which sets ENABLE_CCACHE to AUTO in that case. -# Therefore treat empty ENABLE_CCACHE like ON and AUTO. -if(ENABLE_CCACHE STREQUAL "" OR ENABLE_CCACHE) - find_program(CCACHE_PROGRAM ccache) - if(CCACHE_PROGRAM) - set(USE_CCACHE ON) - endif() -endif() - -if(USE_CCACHE) +if(ENABLE_CCACHE AND CCACHE_PROGRAM) set(ffmpeg_conf "--cc=${CCACHE_PROGRAM} ${CMAKE_C_COMPILER}" "--cxx=${CCACHE_PROGRAM} ${CMAKE_CXX_COMPILER}") else() set(ffmpeg_conf --cc=${CMAKE_C_COMPILER} --cxx=${CMAKE_CXX_COMPILER}) |