diff --git a/pom.xml b/pom.xml
index 5fa5d1d52a5f9e73b612eabddfc35f542d0f3502..cf9de38e32b52e1da626b122e334e76bbbfb1786 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>de.monticore.lang.monticar</groupId>
   <artifactId>embedded-montiarc-emadl-generator</artifactId>
-  <version>0.2.2-SNAPSHOT</version>
+  <version>0.2.3-SNAPSHOT</version>
 
   <!-- == PROJECT DEPENDENCIES ============================================= -->
 
@@ -17,7 +17,7 @@
     <!-- .. SE-Libraries .................................................. -->
     <emadl.version>0.2.2-SNAPSHOT</emadl.version>
     <CNNTrain.version>0.2.4-SNAPSHOT</CNNTrain.version>
-    <cnnarch-mxnet-generator.version>0.2.3-SNAPSHOT</cnnarch-mxnet-generator.version>
+    <cnnarch-mxnet-generator.version>0.2.4-SNAPSHOT</cnnarch-mxnet-generator.version>
     <cnnarch-caffe2-generator.version>0.2.2-SNAPSHOT</cnnarch-caffe2-generator.version>
     <embedded-montiarc-math-generator>0.0.25-SNAPSHOT</embedded-montiarc-math-generator>
     
diff --git a/src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java b/src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java
index 6f76f66c6f5ce5ad5e26cd1350c565ca9b505018..f08ed68ae1479f5324a66c40ff165df9a59b5417 100644
--- a/src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java
+++ b/src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java
@@ -134,11 +134,21 @@ public class EMADLGenerator {
 
         generateComponent(fileContents, allInstances, taggingResolver, componentInstanceSymbol, symtab);
 
-        fileContents.addAll(generateCNNTrainer(allInstances, componentInstanceSymbol.getComponentType().getFullName().replaceAll("\\.", "_")));
+        String instanceName = componentInstanceSymbol.getComponentType().getFullName().replaceAll("\\.", "_");
+        fileContents.addAll(generateCNNTrainer(allInstances, instanceName));
+
         fileContents.add(ArmadilloHelper.getArmadilloHelperFileContent());
         TypesGeneratorCPP tg = new TypesGeneratorCPP();
         fileContents.addAll(tg.generateTypes(TypeConverter.getTypeSymbols()));
 
+        if (cnnArchGenerator.isCMakeRequired()) {
+            cnnArchGenerator.setGenerationTargetPath(getGenerationTargetPath());
+            Map<String, String> cmakeContentsMap = cnnArchGenerator.generateCMakeContent(componentInstanceSymbol.getFullName());
+            for (String fileName : cmakeContentsMap.keySet()){
+                fileContents.add(new FileContent(cmakeContentsMap.get(fileName), fileName));
+            }
+        }
+
         if (emamGen.shouldGenerateMainClass()) {
             //fileContents.add(emamGen.getMainClassFileContent(componentInstanceSymbol, fileContents.get(0)));
         } else if (emamGen.shouldGenerateSimulatorInterface()) {