add cmake args

CMakeLists.txt

@@ -9,6 +9,7 @@ set(CMKRLIB_SOURCES
 	"src/args.cpp"
 	"src/gen.cpp"
 	"src/help.cpp"
+	"src/build.cpp"
 	)
 
 add_library(cmkrlib STATIC ${CMKRLIB_SOURCES})

README.md

@@ -40,7 +40,7 @@ version = "0.1.0"
 [[bin]]
 name = "cmkrlib"
 type = "static"
-sources = ["src/args.cpp", "src/gen.cpp", "src/help.cpp"]
+sources = ["src/args.cpp", "src/gen.cpp", "src/help.cpp", "src/build.cpp"]
 include-dirs = ["vendor"]
 features = ["cxx_std_17"]
 
@@ -59,15 +59,18 @@ cpp-flags = [] # optional
 c-flags = [] # optional
 link-flags = [] # optional
 subdirs = [] # optional
+bin-dir = "bin" # optional
+generator = "Ninja" # optional
+arguments = ["CMAKE_TOOLCHAIN_FILE=/path/to/toolchain"] # optional
 
 [project] # required per project
 name = "app" # required
 version = "0.1.0" # required
 
-[find] # optional, runs find_package, use "*" to ignore version
+[find-package] # optional, runs find_package, use "*" to ignore version
 boost = "1.74.0" # optional
 
-[fetch] # optional, runs fetchContent
+[fetch-content] # optional, runs fetchContent
 toml11 = { git = "https://github.com/ToruNiina/toml11", git-tag = "v3.5.0" } # optional
 
 [[bin]] # required, can define several binaries
@@ -92,7 +95,7 @@ arguments:
 ```
 The build command invokes cmake and the default build-system on your platform, it also accepts extra cmake arguments:
 ```
-cmkr build -GNinja -DCMAKE_TOOLCHAIN_FILE=/path/to/toolchain -DCMAKE_BUILD_TYPE=Release 
+cmkr build --config Release 
 ```
 
 ## Roadmap

cmake.toml

@@ -8,7 +8,7 @@ version = "0.1.0"
 [[bin]]
 name = "cmkrlib"
 type = "static"
-sources = ["src/args.cpp", "src/gen.cpp", "src/help.cpp"]
+sources = ["src/args.cpp", "src/gen.cpp", "src/help.cpp", "src/build.cpp"]
 include-dirs = ["vendor"]
 features = ["cxx_std_17"]
 

src/args.cpp

@@ -1,11 +1,10 @@
 #include "args.h"
+#include "build.h"
 #include "gen.h"
 #include "help.h"
 
 #include <filesystem>
-#include <stddef.h>
 #include <stdexcept>
-#include <stdlib.h>
 #include <string>
 #include <vector>
 
@@ -31,14 +30,7 @@ const char *handle_args(int argc, char **argv) {
         cmkr::gen::generate_project(args[2].c_str());
         return "Directory initialized!";
     } else if (main_arg == "build") {
-        std::string command = "cmake -S. -Bbin ";
-        if (args.size() > 2) {
-            for (size_t i = 2; i < args.size(); ++i) {
-                command += args[i] + " ";
-            }
-        }
-        command += "&& cmake --build bin";
-        auto ret = system(command.c_str());
+        auto ret = build::run(argc, argv);
         if (ret)
             return "Run faced an error!";
         return "Run completed!";

src/build.cpp

@@ -0,0 +1,51 @@
+#include "build.h"
+
+#include <filesystem>
+#include <sstream>
+#include <stddef.h>
+#include <stdexcept>
+#include <stdlib.h>
+#include <string>
+#include <toml.hpp>
+
+namespace cmkr::build {
+
+int run(int argc, char **argv) {
+    std::stringstream ss;
+    std::string bin_dir = "bin";
+    if (!std::filesystem::exists("CMakeLists.txt"))
+        throw std::runtime_error("No valid CMakeLists.txt found!");
+
+    const auto toml = toml::parse("cmake.toml");
+    if (toml.contains("cmake")) {
+        const auto &cmake = toml::find(toml, "cmake");
+        ss << "cmake -S. -B";
+        if (cmake.contains("bin-dir")) {
+            bin_dir = toml::find(cmake, "bin-dir").as_string();
+        }
+        ss << bin_dir << " ";
+        if (cmake.contains("generator")) {
+            const auto gen = toml::find(cmake, "generator").as_string();
+            ss << "-G " << gen << " ";
+        }
+        if (cmake.contains("arguments")) {
+            const auto args = toml::find(cmake, "arguments").as_array();
+            for (const auto &arg : args) {
+                ss << "-D" << arg << " ";
+            }
+        }
+        ss << "&& cmake --build " << bin_dir;
+        if (argc > 2) {
+            for (size_t i = 2; i < argc; ++i) {
+                ss << " " << argv[i];
+            }
+        }
+    }
+    return ::system(ss.str().c_str());
+}
+
+} // namespace cmkr::build
+
+int cmkr_build_run(int argc, char **argv) {
+    return cmkr::build::run(argc, argv);
+}

src/build.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#ifdef __cplusplus
+
+namespace cmkr::build {
+
+int run(int argc, char **argv);
+
+} // namespace cmkr::build
+extern "C" {
+#endif
+
+int cmkr_build_run(int argc, char **argv);
+
+#ifdef __cplusplus
+}
+#endif

src/gen.cpp

@@ -127,9 +127,9 @@ void generate_cmake(const char *path) {
         ss << "project(" << proj_name << " VERSION " << proj_version << ")\n\n";
     }
 
-    if (toml.contains("find")) {
+    if (toml.contains("find-package")) {
         std::map<std::string, std::string> deps =
-            toml::find<std::map<std::string, std::string>>(toml, "find");
+            toml::find<std::map<std::string, std::string>>(toml, "find-package");
         for (const auto &dep : deps) {
             ss << "find_package(" << dep.first;
             if (dep.second != "*") {
@@ -140,9 +140,9 @@ void generate_cmake(const char *path) {
         }
     }
 
-    if (toml.contains("fetch")) {
+    if (toml.contains("fetch-content")) {
         std::map<std::string, std::map<std::string, std::string>> deps =
-            toml::find<std::map<std::string, std::map<std::string, std::string>>>(toml, "fetch");
+            toml::find<std::map<std::string, std::map<std::string, std::string>>>(toml, "fetch-content");
         ss << "include(FetchContent)\n\n";
         for (const auto &dep : deps) {
             ss << "FetchContent_Declare(\n\t" << dep.first << "\n";