diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-07-29 14:01:09 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-07-31 16:46:15 +0200 |
| commit | a2b01de7b674659ac58df4f5623befa0c91b0154 (patch) | |
| tree | 17db2ab821c67b526112c9696563cef79dce2318 /share/qbs | |
| parent | b0d17f77c9e559a55c43e03ed73379889eafb7e5 (diff) | |
introduce Rule.auxiliaryInputs
This eliminates the need of putting "hpp" into
Module.additionalProductFileTags to produce ui_XXX.h files.
Instead, we're making all hpp producing rules dependent on
the compiler rule.
Change-Id: I345cb3bee20d8080e40ca678d4db822ccd1af92e
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'share/qbs')
| -rw-r--r-- | share/qbs/modules/cpp/CppModule.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 1 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index 4b0aefdc8..12ef2b1f6 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -2,8 +2,6 @@ Module { condition: false - additionalProductFileTags: ["hpp"] // to include all rules that generate hpp files - property string warningLevel : 'all' // 'none', 'all' property bool treatWarningsAsErrors : false property string architecture: qbs.architecture diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 59bb5c294..fdf435f2c 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -274,6 +274,7 @@ CppModule { Rule { id: compiler inputs: ["cpp", "c", "objcpp", "objc"] + auxiliaryInputs: ["hpp"] explicitlyDependsOn: ["c++_pch"] Artifact { diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index f37b08b86..47ded894e 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -100,7 +100,9 @@ CppModule { Rule { id: compiler inputs: ["cpp", "c"] + auxiliaryInputs: ["hpp"] explicitlyDependsOn: ["c++_pch"] + Artifact { fileTags: ['obj'] fileName: ".obj/" + product.name + "/" + input.baseDir.replace(':', '') + "/" + input.fileName + ".obj" |