X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=18f33a093676a2d98c54b4a3c2c9a338d8c10df7;hb=243d7c7355c1c5d9a0134440f340936325caaf88;hp=f10e21e5aeee4f3a24c78cfbca194b897c13b16d;hpb=7c0fc22e2ecd8d8c1843f797d52b36610d880227;p=builder.git diff --git a/source/buildinfo.h b/source/buildinfo.h index f10e21e..18f33a0 100644 --- a/source/buildinfo.h +++ b/source/buildinfo.h @@ -27,9 +27,9 @@ public: enum UpdateLevel { - LOCAL, - DEPENDENCY, - CHAINED + LOCAL, //< Include all information + DEPENDENCY, //< Include all but code generation options + CHAINED //< Include only compilation options }; typedef std::map DefineMap; @@ -46,7 +46,10 @@ public: BuildInfo(); - /** Adds another BuildInfo to the end of this one. */ + /** Updates the BuildInfo from another one. Lists are concatenated, with + the first occurrence of each item preserved. Scalars are overwritten. + + The update level determines what information is updated. */ void update_from(const BuildInfo &, UpdateLevel = LOCAL); /** Makes sure there are no duplicate entries in the lists. For warnings,