diff options
| -rw-r--r-- | daemons/gptp/.gitignore | 7 | ||||
| -rw-r--r-- | daemons/gptp/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | daemons/gptp/doc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | daemons/gptp/doc/Doxyfile.in | 6 | ||||
| -rwxr-xr-x | travis.sh | 6 |
5 files changed, 9 insertions, 16 deletions
diff --git a/daemons/gptp/.gitignore b/daemons/gptp/.gitignore index 0fd9b4ec..995d6374 100644 --- a/daemons/gptp/.gitignore +++ b/daemons/gptp/.gitignore @@ -1,6 +1 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Doxyfile -Makefile -doc/html +doc/build diff --git a/daemons/gptp/CMakeLists.txt b/daemons/gptp/CMakeLists.txt deleted file mode 100644 index 11f36f8a..00000000 --- a/daemons/gptp/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -cmake_minimum_required (VERSION 2.8) -project (gPTP) - -add_subdirectory (doc) diff --git a/daemons/gptp/doc/CMakeLists.txt b/daemons/gptp/doc/CMakeLists.txt index 3894bac5..c6fc3dcc 100644 --- a/daemons/gptp/doc/CMakeLists.txt +++ b/daemons/gptp/doc/CMakeLists.txt @@ -10,7 +10,7 @@ if(BUILD_DOCUMENTATION) endif() set(doxyfile_in ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in) - set(doxyfile ${CMAKE_SOURCE_DIR}/Doxyfile) + set(doxyfile ${CMAKE_CURRENT_SOURCE_DIR}/build/Doxyfile) configure_file(${doxyfile_in} ${doxyfile} @ONLY) diff --git a/daemons/gptp/doc/Doxyfile.in b/daemons/gptp/doc/Doxyfile.in index 889750d7..7756614f 100644 --- a/daemons/gptp/doc/Doxyfile.in +++ b/daemons/gptp/doc/Doxyfile.in @@ -58,7 +58,7 @@ PROJECT_LOGO = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = doc +OUTPUT_DIRECTORY = ../doc/build # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -132,7 +132,7 @@ INLINE_INHERITED_MEMB = NO # shortest path that makes the file name unique will be used # The default value is: YES. -FULL_PATH_NAMES = YES +FULL_PATH_NAMES = NO # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. # Stripping is only done if one of the specified strings matches the left-hand @@ -743,7 +743,7 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = common linux/src windows/daemon_cl doc/mainpage.dox +INPUT = ../common ../linux/src ../windows/daemon_cl ../doc/mainpage.dox # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -10,6 +10,8 @@ cmake .. -G "Unix Makefiles" make export ARGS=--output-on-failure make test -cd ../daemons/gptp -cmake . +cd ../daemons/gptp/doc +mkdir build +cd build +cmake .. make doc |