X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMProject.cpp;h=dae81a13434f081c9e51f12e8f671dc4e019ef6c;hb=f3f98131ffd23351c3cd872a0b04aecdc97b7c92;hp=7d0b454eda24c40272a78d8ef410d77dfac711aa;hpb=e992e2085f2a767ab390c3168599047de2ef1d3b;p=crea.git diff --git a/lib/creaDevManagerLib/modelCDMProject.cpp b/lib/creaDevManagerLib/modelCDMProject.cpp index 7d0b454..dae81a1 100644 --- a/lib/creaDevManagerLib/modelCDMProject.cpp +++ b/lib/creaDevManagerLib/modelCDMProject.cpp @@ -45,6 +45,7 @@ #include "CDMUtilities.h" #include "creaWx.h" #include "wx/dir.h" +#include modelCDMProject::modelCDMProject() { @@ -265,7 +266,11 @@ modelCDMLib* modelCDMProject::GetLib() const std::string modelCDMProject::GetBuildInstruction() const { - std::string makeComm = "make -C \"" + this->buildPath + "\""; /*> \"" + this->buildPath + CDMUtilities::SLASH + "building.log\" 2>&1";*/ + wxConfigBase* pConfig = wxConfigBase::Get(); + std::string commandline = crea::wx2std(pConfig->Read(wxT("BUILD_COMMAND"), crea::std2wx(CDMUtilities::BUILD_COMMAND))); + + + std::string makeComm = "cd \"" + this->buildPath + "\";" + commandline;// -C \"" + this->buildPath + "\""; /*> \"" + this->buildPath + CDMUtilities::SLASH + "building.log\" 2>&1";*/ return makeComm; }