summaryrefslogtreecommitdiffstats
path: root/src/plantuml.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-09-16 19:35:43 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-09-16 19:35:43 (GMT)
commit2eece646faff22eeb256cd67b9af424401be2e41 (patch)
tree59b27c03b48ac6fbf40d3f7f774671ebb1d08e56 /src/plantuml.cpp
parentc9a69180f6e47090249711b11fe9c46e42846b88 (diff)
parentbbb6bb217a2feb7b9b961037072f06ff1024a0ef (diff)
downloadDoxygen-2eece646faff22eeb256cd67b9af424401be2e41.zip
Doxygen-2eece646faff22eeb256cd67b9af424401be2e41.tar.gz
Doxygen-2eece646faff22eeb256cd67b9af424401be2e41.tar.bz2
Merge pull request #226 from albert-github/feature/plantuml_include
Support plantuml !include statement
Diffstat (limited to 'src/plantuml.cpp')
-rw-r--r--src/plantuml.cpp19
1 files changed, 18 insertions, 1 deletions
diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index f14ab15..5e5bd98 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -56,7 +56,24 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp
static QCString plantumlJarPath = Config_getString("PLANTUML_JAR_PATH");
QCString pumlExe = "java";
- QCString pumlArgs = "-Djava.awt.headless=true -jar \""+plantumlJarPath+"plantuml.jar\" ";
+ QCString pumlArgs = "";
+
+ QStrList &pumlIncludePathList = Config_getList("PLANTUML_INCLUDE_PATH");
+ char *s=pumlIncludePathList.first();
+ if (s)
+ {
+ pumlArgs += "-Dplantuml.include.path=\"";
+ pumlArgs += s;
+ s = pumlIncludePathList.next();
+ }
+ while (s)
+ {
+ pumlArgs += portable_pathListSeparator();
+ pumlArgs += s;
+ s = pumlIncludePathList.next();
+ }
+ if (pumlIncludePathList.first()) pumlArgs += "\" ";
+ pumlArgs += "-Djava.awt.headless=true -jar \""+plantumlJarPath+"plantuml.jar\" ";
pumlArgs+="-o \"";
pumlArgs+=outDir;
pumlArgs+="\" ";