fix cpp.precompiledHeader property for non-C++ files

For now, this property is ignored for other languages than C++.

Task-number: QBS-187

Change-Id: I3c0af7e60939bd3b934b7464919c3da52733b5fb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 21 insertions, 22 deletions

diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index ed8af567b..ddfffb151 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -56,32 +56,31 @@ function prepareCompiler(product, input, outputs, platformDefines, defines, incl
     }
 
     var objOutput = outputs.obj ? outputs.obj[0] : undefined
-    var pchOutput = outputs["c++_pch"] ? outputs["c++_pch"][0] : undefined
-
-    // precompiled header file
-    var pch = ModUtils.moduleProperty(product, "precompiledHeader")
-    if (pch) {
-        if (pchOutput) {
-            // create pch
-            args.push('/Yc')
-            args.push('/Fp' + FileInfo.toWindowsSeparators(pchOutput.fileName))
-            args.push('/Fo' + FileInfo.toWindowsSeparators(objOutput.fileName))
-            args.push('/TP')
-            args.push(FileInfo.toWindowsSeparators(input.fileName))
-        } else {
-            // use pch
-            var pchHeaderName = FileInfo.toWindowsSeparators(pch)
-            var pchName = FileInfo.toWindowsSeparators(ModUtils.moduleProperty(product, "precompiledHeaderDir")
-                    + "\\.obj\\" + product.name + "\\" + product.name + ".pch")
-            args.push("/FI" + pchHeaderName)
-            args.push("/Yu" + pchHeaderName)
-            args.push("/Fp" + pchName)
-        }
-    }
     args.push('/Fo' + FileInfo.toWindowsSeparators(objOutput.fileName))
     args.push(FileInfo.toWindowsSeparators(input.fileName))
 
     if (isCxx) {
+        // precompiled header file
+        var pch = ModUtils.moduleProperty(product, "precompiledHeader")
+        if (pch) {
+            var pchOutput = outputs["c++_pch"] ? outputs["c++_pch"][0] : undefined
+            if (pchOutput) {
+                // create pch
+                args.push('/Yc')
+                args.push('/Fp' + FileInfo.toWindowsSeparators(pchOutput.fileName))
+                args.push('/Fo' + FileInfo.toWindowsSeparators(objOutput.fileName))
+                args.push('/TP')
+                args.push(FileInfo.toWindowsSeparators(input.fileName))
+            } else {
+                // use pch
+                var pchHeaderName = FileInfo.toWindowsSeparators(pch)
+                var pchName = FileInfo.toWindowsSeparators(ModUtils.moduleProperty(product, "precompiledHeaderDir")
+                        + "\\.obj\\" + product.name + "\\" + product.name + ".pch")
+                args.push("/FI" + pchHeaderName)
+                args.push("/Yu" + pchHeaderName)
+                args.push("/Fp" + pchName)
+            }
+        }
         if (cxxFlags)
             args = args.concat(cxxFlags);
     } else {