1
0
Эх сурвалжийг харах

cmake: Remove ccache support from Xcode builds

PatTheMav 2 долоо хоног өмнө
parent
commit
c10fd25aea

+ 1 - 2
CMakePresets.json

@@ -115,8 +115,7 @@
       "inherits": ["macos"],
       "warnings": {"dev": true, "deprecated": true},
       "cacheVariables": {
-        "CMAKE_COMPILE_WARNING_AS_ERROR": true,
-        "ENABLE_CCACHE": true
+        "CMAKE_COMPILE_WARNING_AS_ERROR": true
       }
     },
     {

+ 0 - 1
cmake/macos/compilerconfig.cmake

@@ -9,7 +9,6 @@ if(NOT XCODE)
   message(FATAL_ERROR "Building OBS Studio on macOS requires Xcode generator.")
 endif()
 
-include(ccache)
 include(compiler_common)
 
 add_compile_options("$<$<NOT:$<COMPILE_LANGUAGE:Swift>>:-fopenmp-simd>")

+ 0 - 13
cmake/macos/resources/ccache-launcher-c.in

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [[ "$1" == "${CMAKE_C_COMPILER}" ]] ; then
-    shift
-fi
-
-export CCACHE_DEPEND=true
-export CCACHE_DIRECT=true
-export CCACHE_FILECLONE=true
-export CCACHE_INODECACHE=true
-export CCACHE_COMPILERCHECK='content'
-export CCACHE_SLOPPINESS='modules,include_file_mtime,include_file_ctime,clang_index_store,system_headers'
-exec "${CMAKE_C_COMPILER_LAUNCHER}" "${CMAKE_C_COMPILER}" "$@"

+ 0 - 13
cmake/macos/resources/ccache-launcher-cxx.in

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [[ "$1" == "${CMAKE_CXX_COMPILER}" ]] ; then
-    shift
-fi
-
-export CCACHE_DEPEND=true
-export CCACHE_DIRECT=true
-export CCACHE_FILECLONE=true
-export CCACHE_INODECACHE=true
-export CCACHE_COMPILERCHECK='content'
-export CCACHE_SLOPPINESS='modules,include_file_mtime,include_file_ctime,clang_index_store,system_headers'
-exec "${CMAKE_CXX_COMPILER_LAUNCHER}" "${CMAKE_CXX_COMPILER}" "$@"

+ 0 - 14
cmake/macos/xcode.cmake

@@ -4,20 +4,6 @@ include_guard(GLOBAL)
 
 set(CMAKE_XCODE_GENERATE_SCHEME TRUE)
 
-# Use a compiler wrapper to enable ccache in Xcode projects
-if(ENABLE_CCACHE AND CCACHE_PROGRAM)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/resources/ccache-launcher-c.in" ccache-launcher-c)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/resources/ccache-launcher-cxx.in" ccache-launcher-cxx)
-
-  execute_process(
-    COMMAND chmod a+rx "${CMAKE_CURRENT_BINARY_DIR}/ccache-launcher-c" "${CMAKE_CURRENT_BINARY_DIR}/ccache-launcher-cxx"
-  )
-  set(CMAKE_XCODE_ATTRIBUTE_CC "${CMAKE_CURRENT_BINARY_DIR}/ccache-launcher-c")
-  set(CMAKE_XCODE_ATTRIBUTE_CXX "${CMAKE_CURRENT_BINARY_DIR}/ccache-launcher-cxx")
-  set(CMAKE_XCODE_ATTRIBUTE_LD "${CMAKE_C_COMPILER}")
-  set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${CMAKE_CXX_COMPILER}")
-endif()
-
 # Set project variables
 set(CMAKE_XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER})
 set(CMAKE_XCODE_ATTRIBUTE_DYLIB_COMPATIBILITY_VERSION 1.0.0)