Merge branch 'master' into 'revert-e86f9476'

# Conflicts:
#   pom.xml

pom.xml

@@ -8,16 +8,16 @@
 
   <groupId>de.monticore.lang.monticar</groupId>
   <artifactId>cnnarch-caffe2-generator</artifactId>
-  <version>0.2.8-SNAPSHOT</version>
+  <version>0.2.9-SNAPSHOT</version>
 
   <!-- == PROJECT DEPENDENCIES ============================================= -->
 
   <properties>
 
     <!-- .. SE-Libraries .................................................. -->
-      <CNNArch.version>0.2.7</CNNArch.version>
-      <CNNTrain.version>0.2.6-SNAPSHOT</CNNTrain.version>
-      <embedded-montiarc-math-generator>0.1.2-SNAPSHOT</embedded-montiarc-math-generator>
+      <CNNArch.version>0.2.8</CNNArch.version>
+      <CNNTrain.version>0.2.6</CNNTrain.version>
+      <embedded-montiarc-math-opt-generator>0.1.4</embedded-montiarc-math-opt-generator>
     
         <!-- .. Libraries .................................................. -->
         <guava.version>18.0</guava.version>
@@ -89,8 +89,8 @@
 
         <dependency>
             <groupId>de.monticore.lang.monticar</groupId>
-            <artifactId>embedded-montiarc-math-generator</artifactId>
-            <version>${embedded-montiarc-math-generator}</version>
+            <artifactId>embedded-montiarc-math-opt-generator</artifactId>
+            <version>${embedded-montiarc-math-opt-generator}</version>
         </dependency>
 
 

src/test/resources/target_code/CMakeLists.txt

 cmake_minimum_required(VERSION 3.5)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 
 project(alexnet LANGUAGES CXX)
 
@@ -28,7 +28,7 @@ endif()
 
 # create static library
 include_directories(${INCLUDE_DIRS})
-add_library(alexnet alexnet.h)
+add_library(alexnet alexnet.cpp)
 target_include_directories(alexnet PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
 target_link_libraries(alexnet PUBLIC ${LIBS})
 set_target_properties(alexnet PROPERTIES LINKER_LANGUAGE CXX)