From 33872fc72e40331c23a82f2b5ec3e509c7191d7a Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 16 Dec 2017 18:23:00 +0100 Subject: Modify ninja interface to build after creating build file This setup is needed because we need to build the project before building tests --- src/GlobalLib.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/GlobalLib.cpp') diff --git a/src/GlobalLib.cpp b/src/GlobalLib.cpp index c38e22f..30a044f 100644 --- a/src/GlobalLib.cpp +++ b/src/GlobalLib.cpp @@ -203,14 +203,10 @@ namespace sibs if(createBuildDirResult.isErr()) return Result::Err(createBuildDirResult); - Result buildFileResult = ninja.createBuildFile(sibsConfig, debugBuildPath.c_str(), staticLinkerFlagCallbackFunc, dynamicLinkerFlagCallbackFunc); + Result buildFileResult = ninja.build(sibsConfig, debugBuildPath.c_str(), staticLinkerFlagCallbackFunc, dynamicLinkerFlagCallbackFunc); if (buildFileResult.isErr()) return Result::Err(buildFileResult.getErrMsg()); - Result buildResult = ninja.build(debugBuildPath.c_str()); - if (buildResult.isErr()) - return Result::Err(buildResult.getErrMsg()); - return Result::Ok(libPath); } } -- cgit v1.2.3