From d870a7a4535e801e1161ececccd0d85dca0a3408 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 20 Oct 2020 10:37:22 +0200 Subject: cmake: Remove ccache magic Setting the compiler/linker prefix globally heavily interferes with other setups. For example it breaks compiling resources with rc.exe on Windows. Use CMAKE_C_COMPILER_LAUNCHER=ccache and CMAKE_CXX_COMPILER_LAUNCHER=ccache when calling cmake instead. Change-Id: Id7fa7a3ce8b19b658eee0b661c9dfa060c3d62c9 Reviewed-by: Cristian Adam Reviewed-by: Ivan Komissarov --- CMakeLists.txt | 6 ------ scripts/build-qbs-with-cmake.sh | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d3376b15..18b8c7fc7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,12 +27,6 @@ option(WITH_UNIT_TESTS "Build Unit Tests" OFF) option(WITH_PROJECT_FILE_UPDATES "Enable project file updates support" OFF) option(INSTALL_PUBLIC_HEADERS "Whether to install public headers" ON) -find_program(CCACHE_FOUND ccache) -if(CCACHE_FOUND) - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) - set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) # Less useful to do it for linking, see edit2 -endif(CCACHE_FOUND) - if(WITH_TESTS) enable_testing() set(QT_TEST_COMPONENT Test) diff --git a/scripts/build-qbs-with-cmake.sh b/scripts/build-qbs-with-cmake.sh index 96a3a207a..73ba353b8 100755 --- a/scripts/build-qbs-with-cmake.sh +++ b/scripts/build-qbs-with-cmake.sh @@ -45,7 +45,7 @@ set -e # export QBS_AUTOTEST_SETTINGS_DIR="${QBS_AUTOTEST_SETTINGS_DIR:-/tmp/qbs-settings}" -BUILD_OPTIONS="-DWITH_UNIT_TESTS=1 -DWITH_PROJECT_FILE_UPDATES=1 ${BUILD_OPTIONS}" +BUILD_OPTIONS="-DWITH_UNIT_TESTS=1 -DWITH_PROJECT_FILE_UPDATES=1 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ${BUILD_OPTIONS}" QMAKE_PATH="${QMAKE_PATH:-$(which qmake)}" QT_DIR=$(dirname ${QMAKE_PATH})/../ -- cgit v1.2.3