SMCE: autodetect CMake in PATH

Signed-off-by: AeroStun <24841307+AeroStun@users.noreply.github.com>
ItJustWorksTM · Jan 22, 2021 · fb0204b · fb0204b
1 parent 4827f2e
commit fb0204b
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 33 deletions.
diff --git a/include/SMCE/ExecutionContext.hpp b/include/SMCE/ExecutionContext.hpp
@@ -27,10 +27,12 @@ namespace smce {
 
 class ExecutionContext {
     stdfs::path m_res_dir;
+    std::string m_cmake_path = "cmake";
 
   public:
     explicit ExecutionContext(stdfs::path resources_dir) : m_res_dir{std::move(resources_dir)} {};
     [[nodiscard]] const stdfs::path& resource_dir() const noexcept { return m_res_dir; }
+    [[nodiscard]] const std::string& cmake_path() const noexcept { return m_cmake_path; }
     [[nodiscard]] bool check_suitable_environment() noexcept;
 };
 

diff --git a/src/SMCE/BoardRunner.cpp b/src/SMCE/BoardRunner.cpp
@@ -39,7 +39,6 @@ LONG NTAPI NtResumeProcess(HANDLE ProcessHandle);
 #include <boost/interprocess/managed_shared_memory.hpp>
 #include <SMCE/BoardConf.hpp>
 #include <SMCE/BoardView.hpp>
-#include <SMCE/internal/BoardData.hpp>
 #include <SMCE/internal/SharedBoardData.hpp>
 
 using namespace std::literals;
@@ -107,41 +106,11 @@ bool BoardRunner::configure(std::string_view pp_fqbn, const BoardConfig& bconf)
     m_internal->sbdata.configure("SMCE-Runner-" + std::to_string(m_internal->sketch_id), pp_fqbn, bconf);
     m_status = Status::configured;
     return true;
-
-#if 0
-#pragma region move_me_to_check_suitable_env
-    if(std::error_code ec; stdfs::is_empty(res_path, ec) || ec)
-        return false;
-
-    std::string cmake_path = []{ const auto env = std::getenv("SMCE_CMAKE_PATH"); return env ? env : ""; }();
-    if(!cmake_path.empty()) {
-        if(std::error_code ec; stdfs::is_empty(cmake_path, ec) || ec)
-            return false;
-    } else {
-        cmake_path = bp::search_path(cmake_path).string();
-        if(cmake_path.empty())
-            return false;
-    }
-    bp::ipstream cmake_out;
-    bp::child cmake_child{cmake_path, "--version", bp::std_out > cmake_out};
-    std::string line;
-    while (cmake_child.running() && std::getline(cmake_out, line) && !line.empty()) {
-        if(line.starts_with("cmake")) {
-            cmake_child.join();
-            return false;
-        }
-        break;
-    }
-    cmake_child.join();
-#pragma endregion
-#endif
 }
 
 bool BoardRunner::build(const stdfs::path& sketch_src, [[maybe_unused]] const SketchConfig& skonf) noexcept {
-
     const auto& res_path = m_exectx.resource_dir();
-//  const auto& cmake_path = m_exectx.cmake_path();
-    const auto cmake_path = "/usr/local/bin/cmake";
+    const auto& cmake_path = m_exectx.cmake_path();
 
     std::string dir_arg = "-DSMCE_DIR=" + res_path.string();
     std::string fqbn_arg = "-DSKETCH_FQBN="s + m_internal->sbdata.get_board_data()->fqbn.c_str();

diff --git a/src/SMCE/ExecutionContext.cpp b/src/SMCE/ExecutionContext.cpp
@@ -16,4 +16,38 @@
  *
  */
 
-#include <SMCE/ExecutionContext.hpp>
+#include <SMCE/ExecutionContext.hpp>
+
+#include <boost/process.hpp>
+
+namespace bp = boost::process;
+
+namespace smce {
+
+[[nodiscard]] bool ExecutionContext::check_suitable_environment() noexcept {
+    if(std::error_code ec; stdfs::is_empty(m_res_dir, ec) || ec)
+        return false;
+
+    if(m_cmake_path != "cmake") {
+        if(std::error_code ec; stdfs::is_empty(m_cmake_path, ec) || ec)
+            return false;
+    } else {
+        m_cmake_path = bp::search_path(m_cmake_path).string();
+        if(m_cmake_path.empty())
+            return false;
+    }
+    bp::ipstream cmake_out;
+    bp::child cmake_child{m_cmake_path, "--version", bp::std_out > cmake_out};
+    std::string line;
+    while (cmake_child.running() && std::getline(cmake_out, line) && !line.empty()) {
+        if(!line.starts_with("cmake")) {
+            cmake_child.join();
+            return false;
+        }
+        break;
+    }
+    cmake_child.join();
+    return cmake_child.native_exit_code() == 0;
+}
+
+}