dep fix
This commit is contained in:
parent
698665215b
commit
89302a5534
2 changed files with 1 additions and 3 deletions
|
|
@ -208,7 +208,7 @@ namespace Crafter {
|
|||
Project project = Project::LoadFromJSON(config.dependencies[i].path);
|
||||
for(Configuration& depConfig : project.configurations) {
|
||||
if(depConfig.name == config.dependencies[i].configuration){
|
||||
fs::path depBuildDir = fs::path(config.dependencies[i].path).parent_path()/depConfig.buildDir;
|
||||
fs::path depBuildDir = fs::path(config.dependencies[i].path).parent_path()/project.buildDir/depConfig.name;
|
||||
project.Build(depConfig, pcmDir, binDir, depBuildDir, project.name);
|
||||
libMutex.lock();
|
||||
if (depLibSet.insert(project.name).second) {
|
||||
|
|
|
|||
|
|
@ -51,8 +51,6 @@ namespace Crafter {
|
|||
export class Configuration {
|
||||
public:
|
||||
std::string name;
|
||||
fs::path buildDir;
|
||||
fs::path binDir;
|
||||
std::string standard;
|
||||
std::vector<std::unique_ptr<Module>> interfaces;
|
||||
std::vector<Implementation> implementations;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue