Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
E
EMAM2Middleware
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
generators
EMAM2Middleware
Commits
fd12fde2
Commit
fd12fde2
authored
Aug 12, 2018
by
Alexander David Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use generated cmake for cpp projects
parent
0c204286
Pipeline
#67933
failed with stages
in 3 minutes and 15 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
19 deletions
+4
-19
pom.xml
pom.xml
+2
-2
src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/TemplateHelper.java
...monticar/generator/middleware/helpers/TemplateHelper.java
+0
-3
src/main/java/de/monticore/lang/monticar/generator/middleware/impls/CPPGenImpl.java
.../lang/monticar/generator/middleware/impls/CPPGenImpl.java
+2
-8
src/main/resources/de/monticore/lang/monticar/generator/middleware/cmakeCppTemplate.ftl
...e/lang/monticar/generator/middleware/cmakeCppTemplate.ftl
+0
-6
No files found.
pom.xml
View file @
fd12fde2
...
...
@@ -9,7 +9,7 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
embedded-montiarc-math-middleware-generator
</artifactId>
<version>
0.0.
6
-SNAPSHOT
</version>
<version>
0.0.
7
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
...
...
@@ -17,7 +17,7 @@
<!-- .. SE-Libraries .................................................. -->
<se-commons.version>
1.7.7
</se-commons.version>
<Embedded-montiarc-math-generator.version>
0.0.
18
-SNAPSHOT
</Embedded-montiarc-math-generator.version>
<Embedded-montiarc-math-generator.version>
0.0.
25
-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>
<!--TODO: remove with update to new emam version-->
...
...
src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/TemplateHelper.java
View file @
fd12fde2
...
...
@@ -52,7 +52,4 @@ public class TemplateHelper {
return
getTemplate
(
"coordinatorCmakeListsTemplate.ftl"
);
}
public
static
String
getCmakeCppTemplate
()
{
return
getTemplate
(
"cmakeCppTemplate.ftl"
);
}
}
src/main/java/de/monticore/lang/monticar/generator/middleware/impls/CPPGenImpl.java
View file @
fd12fde2
...
...
@@ -2,6 +2,7 @@ package de.monticore.lang.monticar.generator.middleware.impls;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.ExpandedComponentInstanceSymbol
;
import
de.monticore.lang.monticar.generator.FileContent
;
import
de.monticore.lang.monticar.generator.cmake.CMakeConfig
;
import
de.monticore.lang.monticar.generator.cpp.GeneratorCPP
;
import
de.monticore.lang.monticar.generator.middleware.helpers.NameHelper
;
import
de.monticore.lang.monticar.generator.middleware.helpers.TemplateHelper
;
...
...
@@ -19,6 +20,7 @@ public class CPPGenImpl implements GeneratorImpl {
public
CPPGenImpl
(){
generatorCPP
=
new
GeneratorCPP
();
generatorCPP
.
useArmadilloBackend
();
generatorCPP
.
setGenerateCMake
(
true
);
}
public
void
setGeneratorCPP
(
GeneratorCPP
generatorCPP
){
...
...
@@ -30,7 +32,6 @@ public class CPPGenImpl implements GeneratorImpl {
List
<
File
>
files
=
new
ArrayList
<>();
generatorCPP
.
setGenerationTargetPath
(
generationTargetPath
);
files
.
add
(
generatorCPP
.
generateFile
(
generateCMake
(
componentInstanceSymbol
)));
files
.
addAll
(
generatorCPP
.
generateFiles
(
componentInstanceSymbol
,
taggingResolver
));
return
files
;
...
...
@@ -41,11 +42,4 @@ public class CPPGenImpl 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
.
getCmakeCppTemplate
().
replace
(
"${compName}"
,
name
));
return
cmake
;
}
}
src/main/resources/de/monticore/lang/monticar/generator/middleware/cmakeCppTemplate.ftl
deleted
100644 → 0
View file @
0c204286
cmake_minimum_required(VERSION 3.5)
project(${compName} LANGUAGES CXX)
add_library(${compName} ${compName}.h)
target_include_directories(${compName} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
set_target_properties(${compName} PROPERTIES LINKER_LANGUAGE CXX)
export(TARGETS ${compName} FILE ${compName}.cmake)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment