Skip to content

Commit

Permalink
Update qbs.py (#7619)
Browse files Browse the repository at this point in the history
  • Loading branch information
Psy-Kai committed Aug 30, 2020
1 parent 46b55d6 commit 86400ea
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion conans/client/generators/qbs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ def __init__(self, cpp_info):
for p in cpp_info.include_paths)
self.lib_paths = delimiter.join('"%s"' % p.replace("\\", "/")
for p in cpp_info.lib_paths)
self.libs = delimiter.join('"%s"' % l for l in cpp_info.libs)
self.libs = delimiter.join('"%s"' % l for l in (cpp_info.libs + cpp_info.system_libs))
self.framework_paths = delimiter.join('"%s"' % p.replace("\\", "/")
for p in cpp_info.framework_paths)
self.frameworks = delimiter.join('"%s"' % f for f in cpp_info.frameworks)
self.defines = delimiter.join('"%s"' % d for d in cpp_info.defines)
self.cxxflags = delimiter.join('"%s"' % d
for d in cpp_info.cxxflags)
Expand Down Expand Up @@ -39,6 +42,8 @@ def content(self):
' cpp.libraryPaths: [{deps.lib_paths}]\n'
' cpp.systemIncludePaths: [{deps.bin_paths}]\n'
' cpp.dynamicLibraries: [{deps.libs}]\n'
' cpp.frameworkPaths: [{deps.framework_paths}]\n'
' cpp.frameworks: [{deps.frameworks}]\n'
' cpp.defines: [{deps.defines}]\n'
' cpp.cxxFlags: [{deps.cxxflags}]\n'
' cpp.cFlags: [{deps.cflags}]\n'
Expand Down

0 comments on commit 86400ea

Please sign in to comment.