Merge branch 'main' into feature-msvc-static

include/project_parser.hpp

@@ -67,7 +67,6 @@ struct Target {
     TargetType type = target_last;
     std::string type_name;
 
-    ConditionVector headers;
     ConditionVector sources;
 
     // https://cmake.org/cmake/help/latest/manual/cmake-commands.7.html#project-commands

src/project_parser.cpp

@@ -487,9 +487,18 @@ Project::Project(const Project *parent, const std::string &path, bool build) {
             throw std::runtime_error(format_key_error(error, target.type_name, t.find("type")));
         }
 
-        t.optional("headers", target.headers);
         t.optional("sources", target.sources);
 
+        // Merge the headers into the sources
+        ConditionVector headers;
+        t.optional("headers", headers);
+        for (const auto &itr : headers) {
+            auto &dest = target.sources[itr.first];
+            for (const auto &jtr : itr.second) {
+                dest.push_back(jtr);
+            }
+        }
+
         t.optional("compile-definitions", target.compile_definitions);
         t.optional("private-compile-definitions", target.private_compile_definitions);