From 855cdc0b5ccf93109c0a83a15987ebb3ef56f33e Mon Sep 17 00:00:00 2001 From: Be Date: Sun, 11 Jul 2021 10:39:47 -0500 Subject: [PATCH] CMake: use CXX_COMPILER_LAUNCHER instead of RULE_LAUNCH_COMPILE This allows for removing the hack for RULE_LAUNCH_COMPILE with sccache. https://gitlab.kitware.com/cmake/cmake/-/issues/22405 --- CMakeLists.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b45f500a984..20e471bd481 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -379,7 +379,8 @@ if(MSVC) default_option(SCCACHE_SUPPORT "Enable sccache support" "SCCACHE_EXECUTABLE") message(STATUS "Support for sccache: ${SCCACHE_SUPPORT}") if(SCCACHE_SUPPORT) - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "sccache") + set( CMAKE_C_COMPILER_LAUNCHER "${SCCACHE_EXECUTABLE}" ) + set( CMAKE_CXX_COMPILER_LAUNCHER "${SCCACHE_EXECUTABLE}" ) endif() else() # ccache support @@ -395,8 +396,8 @@ else() # without this compiler messages in `make` backend would be uncolored set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=${BUILD_COLORS}") endif() - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "ccache") - set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "ccache") + set( CMAKE_C_COMPILER_LAUNCHER "${CCACHE_EXECUTABLE}" ) + set( CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_EXECUTABLE}" ) endif() message(STATUS "Support for ccache: ${CCACHE_SUPPORT}") endif() @@ -1740,11 +1741,6 @@ if(WIN32) "${CMAKE_CURRENT_BINARY_DIR}/src/mixxx.rc.include" "${CMAKE_CURRENT_BINARY_DIR}/src/gitinfo.h" ) - # sccache fails with RC files - # https://github.com/mozilla/sccache/issues/947 - if(SCCACHE_SUPPORT) - set_target_properties(mixxx PROPERTIES RULE_LAUNCH_COMPILE "") - endif() target_include_directories(mixxx PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}") endif()