Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Jessica Hawkwell
/
nitrogen
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
2
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit de6ca801
authored
Mar 17, 2020
by
Jessica Hawkwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing documentation thingy
1 parent
e028c59c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
CMakeLists.txt
Doxyfile.in
CMakeLists.txt
View file @
de6ca80
...
@@ -5,12 +5,9 @@ execute_process(COMMAND ./ver.sh OUTPUT_VARIABLE GIT_COMMIT OUTPUT_STRIP_TRAILIN
...
@@ -5,12 +5,9 @@ execute_process(COMMAND ./ver.sh OUTPUT_VARIABLE GIT_COMMIT OUTPUT_STRIP_TRAILIN
set
(
CMAKE_PROJECT_VERSION_TWEAK
${
GIT_COMMIT
}
)
set
(
CMAKE_PROJECT_VERSION_TWEAK
${
GIT_COMMIT
}
)
set
(
PROJECT_VERSION_TWEAK
${
GIT_COMMIT
}
)
set
(
PROJECT_VERSION_TWEAK
${
GIT_COMMIT
}
)
set
(
Nitrogen_VERSION_TWEAK
${
GIT_COMMIT
}
)
set
(
Nitrogen_VERSION_TWEAK
${
GIT_COMMIT
}
)
<<<<<<< HEAD
configure_file
(
Doxyfile.in Doxyfile
)
configure_file
(
Doxyfile.in Doxyfile
)
execute_process
(
COMMAND doxygen
${
CMAKE_BINARY_DIR
}
/Doxyfile WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
execute_process
(
COMMAND doxygen
${
CMAKE_BINARY_DIR
}
/Doxyfile WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
=======
>>>>>>> be9c14e16a3d4dadc0602a50386ba5b6cbaaed53
set
(
CMAKE_CXX_STANDARD 14
)
set
(
CMAKE_CXX_STANDARD 14
)
set
(
CMAKE_C_STANDARD 11
)
set
(
CMAKE_C_STANDARD 11
)
...
...
Doxyfile.in
View file @
de6ca80
...
@@ -171,9 +171,10 @@ STRIP_FROM_PATH =
...
@@ -171,9 +171,10 @@ STRIP_FROM_PATH =
# specify the list of include paths that are normally passed to the compiler
# specify the list of include paths that are normally passed to the compiler
# using the -I flag.
# using the -I flag.
STRIP_FROM_INC_PATH = src/libnde \
STRIP_FROM_INC_PATH = src/nde \
src/libntk \
src/ntk \
src/NitroWin
src/NitroWin \
@CMAKE_CURRENT_BINARY_DIR@
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
# less readable) file names. This can be useful is your file systems doesn't
# less readable) file names. This can be useful is your file systems doesn't
...
@@ -313,7 +314,7 @@ MARKDOWN_SUPPORT = YES
...
@@ -313,7 +314,7 @@ MARKDOWN_SUPPORT = YES
# Minimum value: 0, maximum value: 99, default value: 0.
# Minimum value: 0, maximum value: 99, default value: 0.
# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
TOC_INCLUDE_HEADINGS =
0
TOC_INCLUDE_HEADINGS =
3
# When enabled doxygen tries to link words that correspond to documented
# When enabled doxygen tries to link words that correspond to documented
# classes, or namespaces to their corresponding documentation. Such a link can
# classes, or namespaces to their corresponding documentation. Such a link can
...
@@ -793,9 +794,7 @@ WARN_LOGFILE =
...
@@ -793,9 +794,7 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.
# Note: If this tag is empty the current directory is searched.
INPUT = src/libnde \
INPUT =
src/libntk \
src/NitroWin
# This tag can be used to specify the character encoding of the source files
# 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
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
...
@@ -838,7 +837,7 @@ RECURSIVE = YES
...
@@ -838,7 +837,7 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# Note that relative paths are relative to the directory from which doxygen is
# run.
# run.
EXCLUDE =
EXCLUDE =
deps
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
# directories that are symbolic links (a Unix file system feature) are excluded
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment