Decorate sources as 'generated' to make sure they inject a dependency to their generators, and look for the sources in the build folder instead of the source folder.generated_sources

4 files changed, 24 insertions, 3 deletions

diff --git a/src/ctor.h b/src/ctor.h
index 8dd2ddd..f145eef 100644
--- a/src/ctor.h
+++ b/src/ctor.h
@@ -67,6 +67,12 @@ struct output_file
 	std::string file;
 };
 
+enum class source_type
+{
+	regular,
+	generated,
+};
+
 struct source
 {
 	template <class ... Args>
@@ -74,6 +80,7 @@ struct source
 		          std::is_convertible_v<Args, std::string_view> ||
 		          std::is_same_v<Args, ctor::toolchain> ||
 		          std::is_same_v<Args, ctor::language> ||
+		          std::is_same_v<Args, ctor::source_type> ||
 		          std::is_same_v<Args, ctor::output_file>
 		          ) && ...)
 	constexpr source(Args && ... arg)
@@ -96,6 +103,10 @@ struct source
 			{
 				output = arg.file;
 			}
+			else if constexpr(std::is_same_v<Args, ctor::source_type>)
+			{
+				source_type = arg;
+			}
 		}(), ...);
 	}
 
@@ -103,6 +114,7 @@ struct source
 	ctor::toolchain toolchain{ctor::toolchain::any};
 	ctor::language language{ctor::language::automatic};
 	std::string output{};
+	ctor::source_type source_type{ctor::source_type::regular};
 };
 
 enum class cxx_opt
diff --git a/src/task_cc.cc b/src/task_cc.cc
index 9628455..f81023f 100644
--- a/src/task_cc.cc
+++ b/src/task_cc.cc
@@ -23,6 +23,10 @@ TaskCC::TaskCC(const ctor::build_configuration& config_, const ctor::settings& s
 	, sourceDir(sourceDir_)
 	, _source(source)
 {
+	if(source.source_type == ctor::source_type::generated)
+	{
+		sourceFile = std::filesystem::path(settings.builddir) / sourceFile;
+	}
 	sourceFile /= source.file;
 
 	std::filesystem::path base = sourceFile.parent_path();
@@ -252,6 +256,10 @@ int TaskCC::clean()
 
 std::vector<std::string> TaskCC::depends() const
 {
+	if(_source.source_type == ctor::source_type::generated)
+	{
+		return {sourceFile.string()};
+	}
 	return {};
 }
 
diff --git a/src/task_fn.cc b/src/task_fn.cc
index b6b50ea..ebfdac6 100644
--- a/src/task_fn.cc
+++ b/src/task_fn.cc
@@ -24,6 +24,7 @@ TaskFn::TaskFn(const ctor::build_configuration& config_, const ctor::settings& s
 
 	target_type = config.type;
 	source_language = source.language;
+	std::filesystem::path base = sourceFile.parent_path();
 
 	if(source.output.empty())
 	{
@@ -31,7 +32,7 @@ TaskFn::TaskFn(const ctor::build_configuration& config_, const ctor::settings& s
 		exit(1);
 	}
 
-	_targetFile = source.output;
+	_targetFile = base / source.output;
 }
 
 bool TaskFn::dirtyInner()
diff --git a/src/tasks.cc b/src/tasks.cc
index 94fe269..7de8af9 100644
--- a/src/tasks.cc
+++ b/src/tasks.cc
@@ -114,9 +114,9 @@ std::vector<std::shared_ptr<Task>> taskFactory(const ctor::build_configuration&
 #ifndef BOOTSTRAP
 	else
 	{
-		for(const auto& file : config.sources)
+		for(const auto& source : config.sources)
 		{
-			auto task = std::make_shared<TaskFn>(config, settings, sourceDir, file);
+			auto task = std::make_shared<TaskFn>(config, settings, sourceDir, source);
 			tasks.push_back(task);
 			objects.push_back(task->target());
 		}