From 3eed6d76b7ce280674caab448682a2e4837cb4d7 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 17 Apr 2020 08:56:26 +0200 Subject: [PATCH] CMake: Port the 'ccache' feature This maps to the CMake variable QT_USE_CCACHE. Change-Id: I3258027301284d907f6ecde6c65d2c0dde8f0a11 Reviewed-by: Alexandru Croitor --- configure.cmake | 6 ++++++ util/cmake/configurejson2cmake.py | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/configure.cmake b/configure.cmake index f67dd96b6ec..88c32e2637d 100644 --- a/configure.cmake +++ b/configure.cmake @@ -781,6 +781,12 @@ qt_feature("compile_examples" AUTODETECT NOT WASM ) qt_feature_config("compile_examples" QMAKE_PRIVATE_CONFIG) +qt_feature("ccache" + LABEL "Using ccache" + AUTODETECT 1 + CONDITION QT_USE_CCACHE +) +qt_feature_config("ccache" QMAKE_PRIVATE_CONFIG) qt_feature("dlopen" PRIVATE LABEL "dlopen()" CONDITION UNIX diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 90bd3e2af60..e2ab8864f07 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -819,7 +819,10 @@ def get_feature_mapping(): "alloc_malloc_h": None, "alloc_stdlib_h": None, "build_all": None, - "ccache": None, + "ccache": { + "autoDetect": "1", + "condition": "QT_USE_CCACHE" + }, "compiler-flags": None, "cross_compile": {"condition": "CMAKE_CROSSCOMPILING"}, "debug_and_release": {