Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added seperate method for CMake check in toolchain #55

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added seperate method for CMake check in toolchain #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/SMCE/Toolchain.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ class SMCE_API Toolchain {
**/
[[nodiscard]] std::error_code check_suitable_environment() noexcept;

[[nodiscard]] std::error_code check_cmake_availability() noexcept;
/**
* Compile a sketch
**/
Expand Down
39 changes: 29 additions & 10 deletions src/SMCE/Toolchain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,16 +257,10 @@ std::error_code Toolchain::do_build(Sketch& sketch) noexcept {
else if (ec)
return ec;

if (m_cmake_path != "cmake") {
if (std::error_code ec; stdfs::is_empty(m_cmake_path, ec))
return toolchain_error::cmake_not_found;
else if (ec)
return ec;
} else {
m_cmake_path = bp::search_path(m_cmake_path).string();
if (m_cmake_path.empty())
return toolchain_error::cmake_not_found;
}
std::error_code ec = check_cmake_availability();
if(ec)
return ec;

bp::ipstream cmake_out;
// clang-format off
const int cmres = bp::system(
Expand All @@ -290,6 +284,31 @@ std::error_code Toolchain::do_build(Sketch& sketch) noexcept {
return {};
}

[[nodiscard]] std::error_code Toolchain::check_cmake_availability() noexcept {
if (m_cmake_path != "cmake") {
if (std::error_code ec; stdfs::is_empty(m_cmake_path, ec)) {
return toolchain_error::cmake_not_found;
}
else if (ec) {
return ec;
}
} else {
m_cmake_path = bp::search_path(m_cmake_path).string();
if (m_cmake_path.empty()) {
if (std::error_code ec; stdfs::is_empty((m_res_dir / "RtResources/CMake/bin/cmake.exe").string(), ec)) {
return toolchain_error::cmake_not_found;
}
else if (ec) {
return ec;
}
else {
m_cmake_path = (m_res_dir / "RtResources/CMake/bin/cmake.exe").string();
}
}
}
return {};
}

std::error_code Toolchain::compile(Sketch& sketch) noexcept {
sketch.m_built = false;
std::error_code ec;
Expand Down