Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-04-25 19:42:16 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-04-25 19:42:16 (GMT) |
| commit | 7ef27db79a528263b17610444f4f85bafd0fa6fa (patch) | |
| tree | 7f569f61b8d0d3661237185fbd6385250a3a83da /Swiften | |
| parent | 5eff3391c316d5ab325b78024296e74127c6747c (diff) | |
| download | swift-7ef27db79a528263b17610444f4f85bafd0fa6fa.zip swift-7ef27db79a528263b17610444f4f85bafd0fa6fa.tar.bz2 | |
swiften-config improvements.
Allow --libs and --cflags to be used in the same command.
Include Boost flags in --cflags.
Add documentation for using swiften-config with SCons.
Change-Id: I36d78cdecab7c2b7b6ef7861e09a43964357f23d
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/Config/SConscript | 5 | ||||
| -rw-r--r-- | Swiften/Config/swiften-config.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Swiften/Config/SConscript b/Swiften/Config/SConscript index 691e9e5..27dfc2e 100644 --- a/Swiften/Config/SConscript +++ b/Swiften/Config/SConscript @@ -20,7 +20,10 @@ swiften_env = env.Clone() swiften_env.UseFlags(swiften_env["SWIFTEN_FLAGS"]) swiften_env.UseFlags(swiften_env["SWIFTEN_DEP_FLAGS"]) -cppflags = replaceSwiftenPath(" ".join([swiften_env.subst("$_CPPDEFFLAGS"), swiften_env.subst("$_CPPINCFLAGS")])) +cppflags = replaceSwiftenPath(" ".join([ + swiften_env.subst("$CPPFLAGS").replace("-isystem ","-I"), + swiften_env.subst("$_CPPDEFFLAGS"), + swiften_env.subst("$_CPPINCFLAGS")])) config_flags += cStringVariable(swiften_env, "CPPFLAGS", cppflags) libflags = replaceSwiftenPath(" ".join([ diff --git a/Swiften/Config/swiften-config.cpp b/Swiften/Config/swiften-config.cpp index de07d74..89df9cd 100644 --- a/Swiften/Config/swiften-config.cpp +++ b/Swiften/Config/swiften-config.cpp @@ -118,7 +118,7 @@ int main(int argc, char* argv[]) { if (vm.count("libs") > 0) { printFlags(libs); } - else if (vm.count("cflags") > 0) { + if (vm.count("cflags") > 0) { printFlags(cflags); } return 0; |