Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
E
EMAM2Middleware
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
4
Issues
4
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
generators
EMAM2Middleware
Commits
a7d22e8e
Commit
a7d22e8e
authored
Feb 11, 2019
by
Alexander David Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix target conflict when generating the same msg files in several subprojects
parent
6138102d
Pipeline
#104138
passed with stages
in 9 minutes and 30 seconds
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
11 deletions
+24
-11
pom.xml
pom.xml
+1
-1
src/main/java/de/monticore/lang/monticar/generator/middleware/DistributedTargetGenerator.java
...icar/generator/middleware/DistributedTargetGenerator.java
+4
-10
src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/TemplateHelper.java
...monticar/generator/middleware/helpers/TemplateHelper.java
+4
-0
src/main/resources/de/monticore/lang/monticar/generator/middleware/SubprojectsCMakeListsTemplate.ftl
...ar/generator/middleware/SubprojectsCMakeListsTemplate.ftl
+15
-0
No files found.
pom.xml
View file @
a7d22e8e
...
...
@@ -9,7 +9,7 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
embedded-montiarc-math-middleware-generator
</artifactId>
<version>
0.0.1
5
-SNAPSHOT
</version>
<version>
0.0.1
6
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
...
...
src/main/java/de/monticore/lang/monticar/generator/middleware/DistributedTargetGenerator.java
View file @
a7d22e8e
...
...
@@ -70,18 +70,12 @@ public class DistributedTargetGenerator extends CMakeGenerator {
protected
File
generateCMake
(
EMAComponentInstanceSymbol
componentInstanceSymbol
)
throws
IOException
{
FileContent
fileContent
=
new
FileContent
();
fileContent
.
setFileName
(
"CMakeLists.txt"
);
StringBuilder
content
=
new
StringBuilder
();
content
.
append
(
"cmake_minimum_required(VERSION 3.5)\n"
);
//TODO setProjectName?
content
.
append
(
"project (default)\n"
);
content
.
append
(
"set (CMAKE_CXX_STANDARD 11)\n"
);
subDirs
.
stream
().
filter
(
dir
->
dir
.
equals
(
"rosMsg"
)).
forEach
(
dir
->
content
.
append
(
"add_subdirectory("
+
dir
+
")\n"
)
);
StringBuilder
content
=
new
StringBuilder
();
content
.
append
(
TemplateHelper
.
getSubprojectsCMake
());
subDirs
.
stream
().
filter
(
dir
->
!
dir
.
equals
(
"rosMsg"
)).
forEach
(
dir
->
content
.
append
(
"add_subdir
ectory
("
+
dir
+
")\n"
)
subDirs
.
forEach
(
dir
->
content
.
append
(
"add_subdir
_without_target_import
("
+
dir
+
")\n"
)
);
fileContent
.
setFileContent
(
content
.
toString
());
...
...
src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/TemplateHelper.java
View file @
a7d22e8e
...
...
@@ -48,4 +48,8 @@ public class TemplateHelper {
return
getTemplate
(
"coordinatorCmakeListsTemplate.ftl"
);
}
public
static
String
getSubprojectsCMake
()
{
return
getTemplate
(
"SubprojectsCMakeListsTemplate.ftl"
);
}
}
src/main/resources/de/monticore/lang/monticar/generator/middleware/SubprojectsCMakeListsTemplate.ftl
0 → 100644
View file @
a7d22e8e
cmake_minimum_required(VERSION 3.5)
project (default)
set (CMAKE_CXX_STANDARD 14)
include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
function(add_subdir_without_target_import subdir)
ExternalProject_Add(
_${subdir}
DOWNLOAD_COMMAND ""
INSTALL_COMMAND cmake -E echo "Skipping install step."
SOURCE_DIR ${CMAKE_SOURCE_DIR}/${subdir}
BUILD_ALWAYS 1
)
endfunction(add_subdir_without_target_import)
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