aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'share/qbs/modules/cpp')
-rw-r--r--share/qbs/modules/cpp/keil.js16
-rw-r--r--share/qbs/modules/cpp/keil.qbs1
2 files changed, 17 insertions, 0 deletions
diff --git a/share/qbs/modules/cpp/keil.js b/share/qbs/modules/cpp/keil.js
index fbdc0e9fb..c19fdd738 100644
--- a/share/qbs/modules/cpp/keil.js
+++ b/share/qbs/modules/cpp/keil.js
@@ -139,6 +139,22 @@ function dumpMacros(compilerFilePath, tag, nullDevice) {
return map;
}
+function dumpDefaultPaths(compilerFilePath, architecture) {
+ var includePaths = [];
+
+ if (architecture === "mcs51") {
+ var path = compilerFilePath.replace(/bin[\\\/](.*)$/i, "inc");
+ includePaths.push(path);
+ } else if (architecture === "arm") {
+ var path = compilerFilePath.replace(/bin[\\\/](.*)$/i, "include");
+ includePaths.push(path);
+ }
+
+ return {
+ "includePaths": includePaths
+ };
+}
+
function adjustPathsToWindowsSeparators(sourcePaths) {
var resulingPaths = [];
sourcePaths.forEach(function(path) {
diff --git a/share/qbs/modules/cpp/keil.qbs b/share/qbs/modules/cpp/keil.qbs
index 3d03f9112..10bc39e12 100644
--- a/share/qbs/modules/cpp/keil.qbs
+++ b/share/qbs/modules/cpp/keil.qbs
@@ -61,6 +61,7 @@ CppModule {
endianness: keilProbe.endianness
compilerDefinesByLanguage: keilProbe.compilerDefinesByLanguage
+ compilerIncludePaths: keilProbe.includePaths
property string toolchainInstallPath: compilerPathProbe.found
? compilerPathProbe.path : undefined