diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2016-09-11 09:52:17 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2016-09-11 09:52:17 (GMT) |
| commit | ca388471e61564211123e1f40dd57ece3e4cb2c5 (patch) | |
| tree | c061638edb9fde27bca6e30f97b5c3ebbe74e723 /src/plantuml.cpp | |
| parent | 6c6b847bcd16cc818165b51e62dc11a947f7e084 (diff) | |
| parent | b38efd15eb69b2b61e05ee09fc9ed6474cc8b1da (diff) | |
| download | Doxygen-ca388471e61564211123e1f40dd57ece3e4cb2c5.zip Doxygen-ca388471e61564211123e1f40dd57ece3e4cb2c5.tar.gz Doxygen-ca388471e61564211123e1f40dd57ece3e4cb2c5.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src/plantuml.cpp')
| -rw-r--r-- | src/plantuml.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plantuml.cpp b/src/plantuml.cpp index 169968e..8e40f36 100644 --- a/src/plantuml.cpp +++ b/src/plantuml.cpp @@ -54,6 +54,7 @@ QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,con void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutputFormat format) { static QCString plantumlJarPath = Config_getString(PLANTUML_JAR_PATH); + static QCString plantumlConfigFile = Config_getString(PLANTUML_CFG_FILE); QCString pumlExe = "java"; QCString pumlArgs = ""; @@ -74,6 +75,12 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp } if (pumlIncludePathList.first()) pumlArgs += "\" "; pumlArgs += "-Djava.awt.headless=true -jar \""+plantumlJarPath+"plantuml.jar\" "; + if (plantumlConfigFile != "") + { + pumlArgs += "-config \""; + pumlArgs += plantumlConfigFile; + pumlArgs += "\" "; + } pumlArgs+="-o \""; pumlArgs+=outDir; pumlArgs+="\" "; |