From 9053d11310842cb9b8a0f13fe1d86b60cae5231c Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Wed, 15 Oct 2014 21:27:45 +0300 Subject: [PATCH] Support conditionals inside source generator definitions --- source/sourcegenerator.cpp | 4 +++- source/sourcegenerator.h | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/source/sourcegenerator.cpp b/source/sourcegenerator.cpp index 4f75721..76d6c89 100644 --- a/source/sourcegenerator.cpp +++ b/source/sourcegenerator.cpp @@ -1,4 +1,5 @@ #include +#include #include "builder.h" #include "executable.h" #include "externaltask.h" @@ -69,7 +70,8 @@ Task *SourceGenerator::run(const Target &target) const SourceGenerator::Loader::Loader(SourceGenerator &sg): - DataFile::ObjectLoader(sg) + DataFile::ObjectLoader(sg), + ConditionalLoader(sg.package, format("%s/%s", sg.package.get_name(), sg.tag)) { add("command", &Loader::command); add("in_suffix", &Loader::in_suffix); diff --git a/source/sourcegenerator.h b/source/sourcegenerator.h index 28456ad..bb1a88e 100644 --- a/source/sourcegenerator.h +++ b/source/sourcegenerator.h @@ -2,13 +2,14 @@ #define SOURCEGENERATOR_H_ #include +#include "conditionalloader.h" #include "sourcepackage.h" #include "tool.h" class SourceGenerator: public Tool { public: - class Loader: public Msp::DataFile::ObjectLoader + class Loader: public Msp::DataFile::ObjectLoader, public ConditionalLoader { public: Loader(SourceGenerator &); -- 2.43.0