diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-21 09:57:19 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-28 11:08:05 +0000 |
| commit | b4aa71223c18599302d600b079e20fc0fb51009a (patch) | |
| tree | 70243969c32958fe89489cb45948599c2a1309eb /share | |
| parent | 9503948fd9195f0d07456e66e4dbf7c781f82ef8 (diff) | |
Support command files in cpp.{static,dynamic}Libraries
We will make use of that in a follow-up patch.
Change-Id: I1fb6ca0938bbcc6f53bd0046761023a1b8563949
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/gcc.js | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/msvc.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js index def8d6c76..70c1c0874 100644 --- a/share/qbs/modules/cpp/gcc.js +++ b/share/qbs/modules/cpp/gcc.js @@ -365,7 +365,7 @@ function linkerFlags(project, product, inputs, output) { } args = args.concat(libraryDependencies.libraries.map(function(lib) { - return FileInfo.isAbsolutePath(lib) + return FileInfo.isAbsolutePath(lib) || lib.startsWith('@') ? lib : '-l' + lib; })); diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js index 92b37bfb5..b1f9686e0 100644 --- a/share/qbs/modules/cpp/msvc.js +++ b/share/qbs/modules/cpp/msvc.js @@ -230,7 +230,7 @@ function collectLibraryDependencies(product) { ModUtils.sanitizedModuleProperty(obj, "cpp", "staticLibraries"), ModUtils.sanitizedModuleProperty(obj, "cpp", "dynamicLibraries")); externalLibs.forEach(function (libName) { - if (!libName.match(/\.lib$/i)) + if (!libName.match(/\.lib$/i) && !libName.startsWith('@')) libName += ".lib"; addFilePath(libName); }); |