diff --git a/.github/scripts/utils.zsh/setup_ccache b/.github/scripts/utils.zsh/setup_ccache index 34f220ad9cdbbe..bf758ce657428b 100644 --- a/.github/scripts/utils.zsh/setup_ccache +++ b/.github/scripts/utils.zsh/setup_ccache @@ -1,9 +1,13 @@ -autoload -Uz log_debug log_warning +autoload -Uz is-at-least log_debug log_warning if (( ${+commands[ccache]} )) { log_debug "Found ccache at ${commands[ccache]}" - ccache --set-config=run_second_cpp=true + local ccache_version=$(ccache --version | head -1 | cut -d ' ' -f 3) + if ! is-at-least 4.12 ${ccache_version}; then + ccache --set-config=run_second_cpp=true + fi + ccache --set-config=direct_mode=true ccache --set-config=inode_cache=true ccache --set-config=compiler_check=content diff --git a/cmake/macos/resources/ccache-launcher-c.in b/cmake/macos/resources/ccache-launcher-c.in index aef91a4053ef0c..173e27553422cf 100644 --- a/cmake/macos/resources/ccache-launcher-c.in +++ b/cmake/macos/resources/ccache-launcher-c.in @@ -4,7 +4,6 @@ if [[ "$1" == "${CMAKE_C_COMPILER}" ]] ; then shift fi -export CCACHE_CPP2=true export CCACHE_DEPEND=true export CCACHE_DIRECT=true export CCACHE_FILECLONE=true diff --git a/cmake/macos/resources/ccache-launcher-cxx.in b/cmake/macos/resources/ccache-launcher-cxx.in index 76c81ee0296df5..61502521464a9b 100644 --- a/cmake/macos/resources/ccache-launcher-cxx.in +++ b/cmake/macos/resources/ccache-launcher-cxx.in @@ -4,7 +4,6 @@ if [[ "$1" == "${CMAKE_CXX_COMPILER}" ]] ; then shift fi -export CCACHE_CPP2=true export CCACHE_DEPEND=true export CCACHE_DIRECT=true export CCACHE_FILECLONE=true diff --git a/plugins/obs-browser b/plugins/obs-browser index c404f3895a6863..19a0a167cbdf8f 160000 --- a/plugins/obs-browser +++ b/plugins/obs-browser @@ -1 +1 @@ -Subproject commit c404f3895a68636c72dcbdfb7a69e316d11d7d3e +Subproject commit 19a0a167cbdf8f4533923856db91da7dc7c7becf