Skip to content

Commit 8135444

Browse files
committed
Correct comments to be compatible with doxygen and add graphs generated by Graphviz
1 parent 9ba4fe5 commit 8135444

19 files changed

+1275
-941
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ cmake_minimum_required(VERSION 3.7)
33
# set name and version of the project
44
project(open_simulation_interface)
55
set(VERSION_MAJOR 2)
6-
set(VERSION_MINOR 1)
6+
set(VERSION_MINOR 2)
77
set(VERSION_PATCH 1)
88

9+
910
find_package(Protobuf 2.6.1 REQUIRED)
1011

1112
set(OSI_PROTO_FILES
@@ -83,7 +84,7 @@ else()
8384

8485
else()
8586

86-
set(doxyfile_in ${CMAKE_CURRENT_SOURCE_DIR}/doxygen-config.cmake.in)
87+
set(doxyfile_in ${CMAKE_CURRENT_SOURCE_DIR}/doxygen_config.cmake.in)
8788
set(doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
8889

8990
configure_file(${doxyfile_in} ${doxyfile} @ONLY)

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,11 @@ Documentation
8181
-------------
8282

8383
In order to generate the doxygen documentation for OSI, please follow the following steps:
84-
1. Install Doxygen and set an environmental variable 'Doxygen' with the path to the binary file.
85-
2. Download and unzip the [zip file containing the filter proto2cpp.py](https://sourceforge.net/projects/proto2cpp/files/latest/download ).
86-
3. From the cmd navigate to the build directory and run:
84+
1. Install [Doxygen](http://www.stack.nl/~dimitri/doxygen/download.html) and set an environmental variable 'doxygen' with the path to the binary file.
85+
2. Download and unzip the [zip file containing the filter proto2cpp.py](https://sourceforge.net/p/proto2cpp/wiki/Home/ ).
86+
3. Install [graphviz-2.38](http://www.graphviz.org/Download_windows.php ) and set an environmental variable 'dot' with the path to the binary file.
87+
4. From the cmd navigate to the build directory and run:
8788
```cmd
8889
cmake -DFILTER_PROTO2CPP_PY_PATH=<path-to-proto2cpp.py> <path-to-CMakeLists.txt>
8990
```
90-
4. The build process will then generate the doxygen documentation under the directory doc.
91+
5. The build process will then generate the doxygen documentation under the directory doc.

doxygen-config.cmake.in renamed to doxygen_config.cmake.in

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,18 @@ PROJECT_NUMBER = @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
44

55
#Set input and output directories
66
INPUT = "@CMAKE_CURRENT_SOURCE_DIR@"
7+
INPUT += "@CMAKE_CURRENT_SOURCE_DIR@/README.md"
8+
9+
USE_MDFILE_AS_MAINPAGE = "@CMAKE_CURRENT_SOURCE_DIR@/README.md"
10+
711
OUTPUT_DIRECTORY = "@CMAKE_CURRENT_SOURCE_DIR@/doc"
12+
IMAGE_PATH = "@CMAKE_CURRENT_SOURCE_DIR@/doc/images"
813

914
# There is no standard configuration for .proto files documentation.
1015
# A Doxygen filter for .proto files has to be added under the directory doc/.
11-
JAVADOC_AUTOBRIEF = YES
16+
JAVADOC_AUTOBRIEF = NO
1217
EXTENSION_MAPPING = proto=C
1318
FILE_PATTERNS = *.proto
1419
INPUT_FILTER = "python @FILTER_PROTO2CPP_PY_PATH@/proto2cpp.py"
20+
HAVE_DOT = YES
21+

0 commit comments

Comments
 (0)