summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2017-10-24 19:44:32 (GMT)
committerGitHub <noreply@github.com>2017-10-24 19:44:32 (GMT)
commit1308178b6787e6cfadc49972236e3c6f03b2ee3e (patch)
tree7f438436b797844a7cff8adead772f76b4b3d63f /src
parent03e724e1a31a29bca29101e7554f973535e5f855 (diff)
parentc24cb9a74ef0af854455047f29f9925d79ac0195 (diff)
downloadDoxygen-1308178b6787e6cfadc49972236e3c6f03b2ee3e.zip
Doxygen-1308178b6787e6cfadc49972236e3c6f03b2ee3e.tar.gz
Doxygen-1308178b6787e6cfadc49972236e3c6f03b2ee3e.tar.bz2
Merge pull request #617 from wich/plantuml-dot-path
Provide dot path to plantuml
Diffstat (limited to 'src')
-rw-r--r--src/plantuml.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index f97f690..609d5fd 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -57,6 +57,7 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp
{
static QCString plantumlJarPath = Config_getString(PLANTUML_JAR_PATH);
static QCString plantumlConfigFile = Config_getString(PLANTUML_CFG_FILE);
+ static QCString dotPath = Config_getString(DOT_PATH);
QCString pumlExe = "java";
QCString pumlArgs = "";
@@ -83,6 +84,12 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp
pumlArgs += plantumlConfigFile;
pumlArgs += "\" ";
}
+ if (Config_getBool(HAVE_DOT) && !dotPath.isEmpty())
+ {
+ pumlArgs += "-graphvizdot \"";
+ pumlArgs += dotPath;
+ pumlArgs += "dot\" ";
+ }
pumlArgs+="-o \"";
pumlArgs+=outDir;
pumlArgs+="\" ";