Commit d0736cc1 authored by Svetlana Pavlitskaya's avatar Svetlana Pavlitskaya Committed by Evgeny Kusmenko

Cmake support

parent 839d2b9b
......@@ -12,12 +12,12 @@ masterJobLinux:
only:
- master
#masterJobWindows:
# stage: windows
# script:
# - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml
# tags:
# - Windows10
masterJobWindows:
stage: windows
script:
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml
tags:
- Windows10
BranchJobLinux:
stage: linux
......
......@@ -9,7 +9,8 @@
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-middleware-generator</artifactId>
<version>0.0.10-SNAPSHOT</version>
<version>0.0.12-SNAPSHOT</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
......@@ -20,8 +21,9 @@
<Embedded-montiarc-math-generator.version>0.0.26-SNAPSHOT</Embedded-montiarc-math-generator.version>
<Embedded-montiarc-math-roscpp-generator.version>0.0.4-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
<Embedded-montiarc-math-rosmsg-generator.version>0.0.3-SNAPSHOT</Embedded-montiarc-math-rosmsg-generator.version>
<EMADL.version>0.2.2-SNAPSHOT</EMADL.version>
<EMADL2CPP.version>0.2.2-SNAPSHOT</EMADL2CPP.version>
<EMADL.version>0.2.3</EMADL.version>
<EMADL2CPP.version>0.2.4</EMADL2CPP.version>
<!--TODO: remove with update to new emam version-->
<Tagging.version>0.0.6</Tagging.version>
<!-- .. Libraries .................................................. -->
......@@ -233,6 +235,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
</plugin>
<plugin>
......
package de.monticore.lang.monticar.generator.middleware.impls;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.ExpandedComponentInstanceSymbol;
import de.monticore.lang.monticar.emadl.generator.Backend;
import de.monticore.lang.monticar.emadl.generator.EMADLGenerator;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.ExpandedComponentInstanceSymbol;
import de.monticore.lang.monticar.generator.FileContent;
import de.monticore.lang.monticar.generator.middleware.helpers.NameHelper;
import de.monticore.lang.monticar.generator.middleware.helpers.TemplateHelper;
import de.monticore.lang.tagging._symboltable.TaggingResolver;
import de.se_rwth.commons.logging.Log;
......@@ -43,7 +42,6 @@ public class EMADLGeneratorImpl implements GeneratorImpl {
files.add(emadlGenerator.getEmamGen().generateFile(fileContent));
}
files.add(emadlGenerator.getEmamGen().generateFile((generateCMake(componentInstanceSymbol))));
return files;
}
......@@ -52,13 +50,5 @@ public class EMADLGeneratorImpl implements GeneratorImpl {
this.generationTargetPath = path;
}
private FileContent generateCMake(ExpandedComponentInstanceSymbol componentInstanceSymbol) {
FileContent cmake = new FileContent();
cmake.setFileName("CMakeLists.txt");
String name = NameHelper.getNameTargetLanguage(componentInstanceSymbol.getFullName());
cmake.setFileContent(TemplateHelper.getCoordinatorCmakeListsTemplate().replace("${compName}", name));
cmake.setFileContent(cmake.getFileContent() + "target_link_libraries(" + name + " -lmxnet)");
return cmake;
}
}
......@@ -140,7 +140,7 @@ public class CliTest{
modelName + "/cpp/CNNBufferFile.h",
modelName + "/cpp/CNNCreator_" + modelName + ".py",
modelName + "/cpp/CNNPredictor_" + modelName + ".h",
modelName + "/cpp/CNNTrainer_tests_emadlTests_ResNet34.py",
modelName + "/cpp/CNNTrainer_" + modelName + ".py",
modelName + "/cpp/CNNTranslator.h",
modelName + "/cpp/HelperA.h",
modelName + "/cpp/CMakeLists.txt",
......
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