From bf64d1e1e4682d51e21e233cf24ce67371e957b9 Mon Sep 17 00:00:00 2001 From: silverqx Date: Thu, 7 Sep 2023 12:07:43 +0200 Subject: [PATCH] qmake added TINY_CCACHE_BUILD to variables.pri - updated docs --- docs/building/tinyorm.mdx | 3 ++- qmake/TinyOrm.pri | 1 + qmake/tom.pri | 1 + qmake/variables.pri | 4 ++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/building/tinyorm.mdx b/docs/building/tinyorm.mdx index 0a8d93ff9..eab30956e 100644 --- a/docs/building/tinyorm.mdx +++ b/docs/building/tinyorm.mdx @@ -817,8 +817,9 @@ These variables will be set after the configuration is done: | Variable Name | Description | | ----------------------------- | ----------- | | `TINY_BUILD_SUBFOLDER` | Folder by release type if `CONFIG+=debug_and_release` is defined (/debug, /release, or an empty string). | +| `TINY_CCACHE_BUILD` | To correctly link `ccache` build against a `ccache` build (_ccache or an empty string). | | `TINY_MSVC_VERSION` | The `msvc` compiler string (MSVC2022 or MSVC2019). | -| `TINY_QT_VERSION_UNDERSCORED` | Underscored Qt version (eg. 6_5_2). | +| `TINY_QT_VERSION_UNDERSCORED` | Underscored `Qt` version (eg. 6_5_2). | | `TINY_RELEASE_TYPE_CAMEL` | Build type string (Debug, Profile, or Release). | | `TINY_VCPKG_INCLUDE` | Path to the `vcpkg` `include` folder (vcpkg/installed/<triplet>/include/). | diff --git a/qmake/TinyOrm.pri b/qmake/TinyOrm.pri index f6e17b877..2fd40fed9 100644 --- a/qmake/TinyOrm.pri +++ b/qmake/TinyOrm.pri @@ -25,6 +25,7 @@ # These variables will be set after the configuration is done: # # - TINY_BUILD_SUBFOLDER - Folder by release type if CONFIG+=debug_and_release is defined (/debug, /release, or an empty string). +# - TINY_CCACHE_BUILD - To correctly link ccache build against a ccache build (_ccache or an empty string). # - TINY_MSVC_VERSION - Msvc compiler string (MSVC2022 or MSVC2019). # - TINY_QT_VERSION_UNDERSCORED - Underscored Qt version (eg. 6_5_2). # - TINY_RELEASE_TYPE_CAMEL - Build type string (Debug, Profile, or Release). diff --git a/qmake/tom.pri b/qmake/tom.pri index d1109e7e1..1d89a8bdf 100644 --- a/qmake/tom.pri +++ b/qmake/tom.pri @@ -25,6 +25,7 @@ # These variables will be set after the configuration is done: # # - TINY_BUILD_SUBFOLDER - Folder by release type if CONFIG+=debug_and_release is defined (/debug, /release, or an empty string). +# - TINY_CCACHE_BUILD - To correctly link ccache build against a ccache build (_ccache or an empty string). # - TINY_MSVC_VERSION - Msvc compiler string (MSVC2022 or MSVC2019). # - TINY_QT_VERSION_UNDERSCORED - Underscored Qt version (eg. 6_5_2). # - TINY_RELEASE_TYPE_CAMEL - Build type string (Debug, Profile, or Release). diff --git a/qmake/variables.pri b/qmake/variables.pri index b56c71d35..e52709d15 100644 --- a/qmake/variables.pri +++ b/qmake/variables.pri @@ -33,3 +33,7 @@ debug_and_release { TINY_BUILD_SUBFOLDER = $$quote(/debug) } else: TINY_BUILD_SUBFOLDER = + +# To correctly link ccache build against a ccache build (_ccache or an empty string) +contains(OUT_PWD, .*ccache.*): TINY_CCACHE_BUILD = _ccache +else: TINY_CCACHE_BUILD =