Commit fc32a9f8 authored by Max Lyon's avatar Max Lyon
Browse files

Merge branch 'ACG_to_VCI' into 'master'

ACG to VCI

See merge request !81
parents ac698f80 75286789
Pipeline #18087 failed with stage
in 3 minutes and 41 seconds
......@@ -20,8 +20,8 @@ if (DOXYGEN_FOUND)
"${CMAKE_CURRENT_SOURCE_DIR}/../src/Unittests"
)
if (${ACG_PROJECT_DATADIR})
set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_DATADIR}/Doc")
if (${VCI_PROJECT_DATADIR})
set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Build/${VCI_PROJECT_DATADIR}/Doc")
else()
set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Build/share/doc/OpenVolumeMesh")
endif()
......
......@@ -58,7 +58,7 @@ PROJECT_LOGO = @CMAKE_CURRENT_SOURCE_DIR@/html/logo_vci.png
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
OUTPUT_DIRECTORY = @CMAKE_BINARY_DIR@/Build/@ACG_PROJECT_DATADIR@/Doc
OUTPUT_DIRECTORY = @CMAKE_BINARY_DIR@/Build/@VCI_PROJECT_DATADIR@/Doc
# 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
......@@ -1117,7 +1117,7 @@ HTML_FILE_EXTENSION = .html
# of the possible markers and block names see the documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.
HTML_HEADER = @CMAKE_CURRENT_SOURCE_DIR@/html/acg_header.html
HTML_HEADER = @CMAKE_CURRENT_SOURCE_DIR@/html/vci_header.html
# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
# generated HTML page. If the tag is left blank doxygen will generate a standard
......@@ -1127,7 +1127,7 @@ HTML_HEADER = @CMAKE_CURRENT_SOURCE_DIR@/html/acg_header.html
# that doxygen normally uses.
# This tag requires that the tag GENERATE_HTML is set to YES.
HTML_FOOTER = @CMAKE_CURRENT_SOURCE_DIR@/html/acg_footer.html
HTML_FOOTER = @CMAKE_CURRENT_SOURCE_DIR@/html/vci_footer.html
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
# sheet that is used by each HTML page. It can be used to fine-tune the look of
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment