Commit 17d55eed authored by Nicola Gatto's avatar Nicola Gatto

Merge branch 'master' into ng-dev

parents 13f719c3 beebefcd
Pipeline #170329 failed with stages
in 2 minutes and 32 seconds
......@@ -6,6 +6,7 @@ stages:
masterJobWindows:
stage: windows
allow_failure: true
script:
- call mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -U
tags:
......
......@@ -20,8 +20,8 @@
<se-commons.version>1.7.7</se-commons.version>
<embedded-montiarc.version>0.1.9-SNAPSHOT</embedded-montiarc.version>
<Embedded-montiarc-math-generator.version>0.1.8-SNAPSHOT</Embedded-montiarc-math-generator.version>
<Embedded-montiarc-math-roscpp-generator.version>0.1.4-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
<Embedded-montiarc-math-generator.version>0.1.12-SNAPSHOT</Embedded-montiarc-math-generator.version>
<Embedded-montiarc-math-roscpp-generator.version>0.1.6-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
<EMADL2CPP.version>0.3.4-SNAPSHOT</EMADL2CPP.version>
<EMADL.version>0.2.8-SNAPSHOT</EMADL.version>
<embedded-montiarc-component-clustering.version>0.0.2-SNAPSHOT</embedded-montiarc-component-clustering.version>
......
......@@ -14,16 +14,22 @@ public class CPPGenImpl implements GeneratorImpl {
private String generationTargetPath;
private GeneratorCPP generatorCPP;
private String modelsDir;
private boolean executionLoggingActive = false;
public CPPGenImpl(String modelsDir){
this.modelsDir = modelsDir;
}
public void setExecutionLoggingActive(boolean active){
executionLoggingActive = active;
}
private void resetGenerator(){
generatorCPP = new GeneratorCPP();
generatorCPP.useArmadilloBackend();
generatorCPP.setGenerateCMake(true);
generatorCPP.setModelsDirPath(Paths.get(modelsDir));
generatorCPP.setExecutionLoggingActive(executionLoggingActive);
//generatorCPP.setGenerateTests(true);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment