From 91e0de19bc55d3306a247116b926dabd0327f413 Mon Sep 17 00:00:00 2001
From: wsnipex <wsnipex@a1.net>
Date: Mon, 11 Jun 2018 13:33:41 +0200
Subject: [cmake] ffmpeg: remove workaround for ccache, pass the options
 instead

---
 cmake/modules/FindFFMPEG.cmake             |  4 +++-
 tools/depends/target/ffmpeg/CMakeLists.txt | 13 +------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
index 7f34505bd4..ef74671d40 100644
--- a/cmake/modules/FindFFMPEG.cmake
+++ b/cmake/modules/FindFFMPEG.cmake
@@ -229,7 +229,9 @@ if(NOT FFMPEG_FOUND)
     message(STATUS "FFMPEG_URL: ${FFMPEG_URL}")
   endif()
 
-  set(FFMPEG_OPTIONS -DENABLE_VAAPI=${ENABLE_VAAPI}
+  set(FFMPEG_OPTIONS -DENABLE_CCACHE=${ENABLE_CCACHE}
+                     -DCCACHE_PROGRAM=${CCACHE_PROGRAM}
+                     -DENABLE_VAAPI=${ENABLE_VAAPI}
                      -DENABLE_VDPAU=${ENABLE_VDPAU})
 
   if(KODI_DEPENDSBUILD)
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})
-- 
cgit v1.2.3