Skip to content

Commit

Permalink
Use master bff directory to compute customPreBuildExe, same as other …
Browse files Browse the repository at this point in the history
…steps
  • Loading branch information
belkiss committed Jan 22, 2022
1 parent 751b5c0 commit 0f45d66
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Sharpmake.Generators/FastBuild/MasterBff.cs
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,6 @@ private static bool GenerateMasterBffFile(Builder builder, ConfigurationsPerBff
foreach (var solutionProject in solutionProjects)
{
var project = solutionProject.Project;
string projectPath = new FileInfo(solutionProject.ProjectFile).Directory.FullName;

// Export projects do not have any bff
if (project.SharpmakeProjectType == Project.ProjectTypeAttribute.Export)
Expand Down Expand Up @@ -412,7 +411,7 @@ private static bool GenerateMasterBffFile(Builder builder, ConfigurationsPerBff

foreach (var buildEvent in conf.ResolvedEventCustomPreBuildExe)
{
string eventKey = ProjectOptionsGenerator.MakeBuildStepName(conf, buildEvent, Vcxproj.BuildStep.PreBuildCustomAction, project.RootPath, projectPath);
string eventKey = ProjectOptionsGenerator.MakeBuildStepName(conf, buildEvent, Vcxproj.BuildStep.PreBuildCustomAction, project.RootPath, masterBffDirectory);
customPreBuildEvents.Add(eventKey, buildEvent);
}

Expand Down

0 comments on commit 0f45d66

Please sign in to comment.