parent
918ce748a4
commit
9bd12660eb
8 changed files with 94 additions and 60 deletions
|
|
@ -268,7 +268,6 @@ namespace Crafter {
|
|||
if(config.contains("dependencies")) {
|
||||
for (auto it : config["dependencies"]) {
|
||||
fs::path path = it["path"].get<std::string>();
|
||||
std::string configName = it["configuration"].get<std::string>();
|
||||
if(path.string().ends_with(".git")) {
|
||||
fs::path name = path.filename();
|
||||
name.replace_extension();
|
||||
|
|
@ -305,7 +304,20 @@ namespace Crafter {
|
|||
// Update path to the project.json of the dependency
|
||||
path = cacheDir / depFolder / "project.json";
|
||||
}
|
||||
|
||||
if(it.contains("type")) {
|
||||
std::string type = it["type"].get<std::string>();
|
||||
if(type == "cmake") {
|
||||
std::string options;
|
||||
if(it.contains("options")) {
|
||||
options = it["options"].get<std::string>();
|
||||
}
|
||||
cmakeDeps.emplace_back(path.parent_path(), options);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
std::string configName = it["configuration"].get<std::string>();
|
||||
|
||||
// Create a Project object for the dependency
|
||||
std::unique_ptr<Project> depProject = std::make_unique<Project>(std::move(path), configName);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue