From 0e2cddcbe6bc077120381529a6002206b1363ae5 Mon Sep 17 00:00:00 2001
From: Duncan Ogilvie <mr.exodia.tpodt@gmail.com>
Date: Tue, 16 Mar 2021 16:36:23 +0100
Subject: [PATCH] Add support for include-before and include-after

---
 src/cmkrlib/cmake.cpp | 10 ++++++++--
 src/cmkrlib/cmake.hpp |  6 ++++--
 src/cmkrlib/gen.cpp   | 25 +++++++++++++++++++++----
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/cmkrlib/cmake.cpp b/src/cmkrlib/cmake.cpp
index 033f738..420bb68 100644
--- a/src/cmkrlib/cmake.cpp
+++ b/src/cmkrlib/cmake.cpp
@@ -71,8 +71,14 @@ CMake::CMake(const std::string &path, bool build) {
 
         if (toml.contains("project")) {
             const auto &project = toml::find(toml, "project");
-            proj_name = toml::find(project, "name").as_string();
-            proj_version = toml::find(project, "version").as_string();
+            project_name = toml::find(project, "name").as_string();
+            project_version = toml::find(project, "version").as_string();
+            if (project.contains("include-before")) {
+                include_before = detail::to_string_vec(toml::find(project, "include-before").as_array());
+            }
+            if (project.contains("include-after")) {
+                include_after = detail::to_string_vec(toml::find(project, "include-after").as_array());
+            }
         }
 
         if (toml.contains("settings")) {
diff --git a/src/cmkrlib/cmake.hpp b/src/cmkrlib/cmake.hpp
index f510eb8..294b5b4 100644
--- a/src/cmkrlib/cmake.hpp
+++ b/src/cmkrlib/cmake.hpp
@@ -67,8 +67,10 @@ struct CMake {
     std::vector<std::string> linkflags;
     std::vector<std::string> gen_args;
     std::vector<std::string> build_args;
-    std::string proj_name;
-    std::string proj_version;
+    std::string project_name;
+    std::string project_version;
+    std::vector<std::string> include_before;
+    std::vector<std::string> include_after;
     std::vector<Setting> settings;
     std::vector<Option> options;
     std::vector<Package> packages;
diff --git a/src/cmkrlib/gen.cpp b/src/cmkrlib/gen.cpp
index e78827c..6a826c8 100644
--- a/src/cmkrlib/gen.cpp
+++ b/src/cmkrlib/gen.cpp
@@ -230,6 +230,15 @@ int generate_cmake(const char *path) {
 
         comment("This file was generated automatically by cmkr.").endl();
 
+        if (!cmake.include_before.empty()) {
+            for (const auto &file : cmake.include_before) {
+                // TODO: warn/error if file doesn't exist?
+                cmd("include")(file);
+            }
+            endl();
+        }
+
+        // TODO: make this a setting in the toml?
         comment("Regenerate CMakeLists.txt file when necessary");
         cmd("include")("cmkr.cmake", "OPTIONAL", "RESULT_VARIABLE", "CMKR_INCLUDE_RESULT").endl();
 
@@ -273,16 +282,24 @@ int generate_cmake(const char *path) {
             for (const auto &dir : cmake.subdirs) {
                 cmd("add_subdirectory")(dir);
             }
-            ss << '\n';
+            endl();
         }
 
-        if (!cmake.proj_name.empty() && !cmake.proj_version.empty()) {
-            auto name = cmake.proj_name;
-            auto version = cmake.proj_version;
+        if (!cmake.project_name.empty() && !cmake.project_version.empty()) {
+            auto name = cmake.project_name;
+            auto version = cmake.project_version;
             cmd("set")(name + "_PROJECT_VERSION", version);
             cmd("project")(name, "VERSION", "${" + name + "_PROJECT_VERSION}").endl();
         }
 
+        if (!cmake.include_after.empty()) {
+            for (const auto &file : cmake.include_after) {
+                // TODO: warn/error if file doesn't exist?
+                cmd("include")(file);
+            }
+            endl();
+        }
+
         if (!cmake.packages.empty()) {
             for (const auto &dep : cmake.packages) {
                 ss << "find_package(" << dep.name << ' ';