Commit 269ee9d0 authored by Malte Heithoff's avatar Malte Heithoff
Browse files

merge cmakeconfig

parent 0c49bd9c
...@@ -885,28 +885,23 @@ public class EMADLGenerator implements EMAMGenerator { ...@@ -885,28 +885,23 @@ public class EMADLGenerator implements EMAMGenerator {
} }
private void mergeCMakeConfigs() { private void mergeCMakeConfigs() {
List<String> cmakeCommandList = emamGen.getCMakeConfig().getCMakeListsViewModel().getCmakeCommandList(); emamGen.getCmakeConfig().getCMakeListsViewModel().getCmakeCommandList()
List<String> cmakeCommandListEnd = emamGen.getCMakeConfig().getCMakeListsViewModel().getCmakeCommandListEnd(); .stream().forEach(s -> cMakeConfig.addCMakeCommand(s));
List<String> cmakeLibraryLinkageList = emamGen.getCMakeConfig().getCMakeListsViewModel().getCmakeLibraryLinkageList(); emamGen.getCmakeConfig().getCMakeListsViewModel().getCmakeCommandListEnd()
LinkedHashSet<CMakeFindModule> moduleDependencies = emamGen.getCMakeConfig().getCMakeListsViewModel().getModuleDependencies(); .stream().forEach(s -> cMakeConfig.addCMakeCommandEnd(s));
// merge emamGen.getCmakeConfig().getCMakeListsViewModel().getCmakeLibraryLinkageList()
.stream().forEach(s -> cMakeConfig.addCmakeLibraryLinkage(s));
emamGen.getCmakeConfig().getCMakeListsViewModel().getModuleDependencies()
.stream().forEach(s -> cMakeConfig.addModuleDependency(s));
cnnArchGenerator.getCmakeConfig().getCMakeListsViewModel().getCmakeCommandList() cnnArchGenerator.getCmakeConfig().getCMakeListsViewModel().getCmakeCommandList()
.stream().filter(s -> !cmakeCommandList.contains(s)) .stream().forEach(s -> cMakeConfig.addCMakeCommand(s));
.forEach(s -> cmakeCommandList.add(s));
cnnArchGenerator.getCmakeConfig().getCMakeListsViewModel().getCmakeCommandListEnd() cnnArchGenerator.getCmakeConfig().getCMakeListsViewModel().getCmakeCommandListEnd()
.stream().filter(s -> !cmakeCommandListEnd.contains(s)) .stream().forEach(s -> cMakeConfig.addCMakeCommandEnd(s));
.forEach(s -> cmakeCommandListEnd.add(s));
cnnArchGenerator.getCmakeConfig().getCMakeListsViewModel().getCmakeLibraryLinkageList() cnnArchGenerator.getCmakeConfig().getCMakeListsViewModel().getCmakeLibraryLinkageList()
.stream().filter(s -> !cmakeLibraryLinkageList.contains(s)) .stream().forEach(s -> cMakeConfig.addCmakeLibraryLinkage(s));
.forEach(s -> cmakeLibraryLinkageList.add(s));
cnnArchGenerator.getCmakeConfig().getCMakeListsViewModel().getModuleDependencies() cnnArchGenerator.getCmakeConfig().getCMakeListsViewModel().getModuleDependencies()
.stream().filter(s -> !moduleDependencies.contains(s)) .stream().forEach(s -> cMakeConfig.addModuleDependency(s));
.forEach(s -> moduleDependencies.add(s));
cMakeConfig.getCMakeListsViewModel().setCmakeCommandList(cmakeCommandList);
cMakeConfig.getCMakeListsViewModel().setCmakeCommandListEnd(cmakeCommandListEnd);
cMakeConfig.getCMakeListsViewModel().setCmakeLibraryLinkageList(cmakeLibraryLinkageList);
cMakeConfig.getCMakeListsViewModel().setModuleDependencies(moduleDependencies);
} }
@Override @Override
......
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