Merge branch 'main' of github.com:DeaSTL/cmake-generator

frate-dev · Nov 2, 2023 · b369ca2 · b369ca2
2 parents 6c77d01 + 66966e6
commit b369ca2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/src/Command/CommandDev.cpp b/src/Command/CommandDev.cpp
@@ -128,7 +128,10 @@ namespace Command {
 
       const std::string command = "cmake . && make && ./" + ctx->build_dir + "/" + ctx->project_name  + " " + command_args;
 #endif
-        system(command.c_str());
+        int success = system(command.c_str());
+        if (success != 0) {
+          std::cout << "Error running project" << std::endl;
+        }
 
         // Call your recompilation command or any other action you want
         },path);

diff --git a/src/Command/CommandHelp.cpp b/src/Command/CommandHelp.cpp
@@ -10,7 +10,11 @@ namespace Command {
     if ((static_cast<std::string>(std::getenv("TERM")) == "xterm-kitty")){
       struct winsize w = {500, 500, 0, 0};
       ioctl(0, TIOCGWINSZ, &w);
-      system("kitty +kitten icat --align left ~/Downloads/logo.png");
+      int success = system("kitty +kitten icat --align left ~/Downloads/logo.png");
+      if (success != 0) {
+        std::cout << "Error printing logo" << std::endl;
+        return false;
+      }
     }
 
     std::cout << "usage: "<< termcolor::green << "cmaker"<< termcolor::reset <<" <sub-command>" << ENDL  

diff --git a/src/Command/CommandRun.cpp b/src/Command/CommandRun.cpp
@@ -5,8 +5,16 @@
 namespace Command {
   bool Interface::run(){
     #ifdef DEBUG
-      system("mkdir -p build/build/");
-      system("cd build && cmake  . && make  && cd ..");
+      int success = system("mkdir -p build/build/");
+      if (success != 0) {
+        std::cout << "Error creating build directory" << std::endl;
+        return false;
+      }
+      success = system("cd build && cmake  . && make  && cd ..");
+      if (success != 0) {
+        std::cout << "Error building project" << std::endl;
+        return false;
+      }
     #else
       system("mkdir -p build");
       system("cmake  . ");
@@ -17,7 +25,11 @@ namespace Command {
       file_name = "./build/build/";
     #endif
     std::string command = file_name + ctx->project_name;
-    system(command.c_str());
+    success = system(command.c_str());
+    if (success != 0) {
+      std::cout << "Error running project" << std::endl;
+      return false;
+    }
     return true;
   }
 }