Skip to content

Commit

Permalink
Merge 5276a43 into c47feab
Browse files Browse the repository at this point in the history
  • Loading branch information
agarny committed Nov 8, 2018
2 parents c47feab + 5276a43 commit f40c675
Show file tree
Hide file tree
Showing 266 changed files with 613 additions and 8,265 deletions.
12 changes: 9 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.3)
cmake_minimum_required(VERSION 3.11)

# Project definition

Expand Down Expand Up @@ -985,11 +985,17 @@ foreach(PLUGIN ${PLUGINS})
add_subdirectory(src/plugins/${PLUGIN})
endforeach()

# Configure our help file
# Fetch parts of our documentation and build it

configure_file(${CMAKE_SOURCE_DIR}/doc/${CMAKE_PROJECT_NAME}.qhcp.in
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/doc
${PROJECT_BUILD_DIR}/doc)

configure_file(${PROJECT_BUILD_DIR}/doc/${CMAKE_PROJECT_NAME}.qhcp.in
${PROJECT_BUILD_DIR}/doc/${CMAKE_PROJECT_NAME}.qhcp)

build_documentation(user)
build_documentation(developer)

# Build the GUI version of OpenCOR

qt5_wrap_cpp(SOURCES_MOC ${HEADERS_MOC})
Expand Down
33 changes: 33 additions & 0 deletions cmake/common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,39 @@ endmacro()

#===============================================================================

macro(build_documentation DOCUMENTATION_NAME)
# Build the given documentation as an external project and have it copied to
# our final documentation directory

set(DOCUMENTATION_BUILD ${DOCUMENTATION_NAME}DocumentationBuild)

string(REPLACE ";" "|"
DOCUMENTATION_SPHINX_EXECUTABLE "${SPHINX_EXECUTABLE}")

ExternalProject_Add(${DOCUMENTATION_BUILD}
SOURCE_DIR
${CMAKE_SOURCE_DIR}/ext/doc/${DOCUMENTATION_NAME}
GIT_REPOSITORY
https://github.com/opencor/${DOCUMENTATION_NAME}-documentation
CMAKE_ARGS
-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
-DSPHINX_EXECUTABLE=${DOCUMENTATION_SPHINX_EXECUTABLE}
LIST_SEPARATOR
|
INSTALL_COMMAND
${CMAKE_COMMAND} -E copy_directory ${PROJECT_BUILD_DIR}/ext/Build/${DOCUMENTATION_BUILD}/html
${PROJECT_BUILD_DIR}/doc/${DOCUMENTATION_NAME}
)

# Add our external project as a dependency to our project build target, so
# that our Help window plugin can generate the help files that will be
# embedded in OpenCOR as a resource

add_dependencies(${PROJECT_BUILD_TARGET} ${DOCUMENTATION_BUILD})
endmacro()

#===============================================================================

macro(add_plugin PLUGIN_NAME)
# Various initialisations

Expand Down
1 change: 0 additions & 1 deletion doc/3rdparty/KaTeX/contrib/auto-render.min.js

This file was deleted.

Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_AMS-Regular.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_AMS-Regular.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_AMS-Regular.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_AMS-Regular.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Caligraphic-Bold.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Caligraphic-Bold.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Caligraphic-Bold.woff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Fraktur-Bold.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Fraktur-Bold.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Fraktur-Bold.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Fraktur-Bold.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Fraktur-Regular.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Fraktur-Regular.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Fraktur-Regular.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Fraktur-Regular.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Main-Bold.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Main-Bold.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Main-Bold.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Main-Bold.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Main-Italic.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Main-Italic.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Main-Italic.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Main-Italic.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Main-Regular.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Main-Regular.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Main-Regular.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Main-Regular.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Math-BoldItalic.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Math-BoldItalic.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Math-BoldItalic.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Math-BoldItalic.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Math-Italic.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Math-Italic.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Math-Italic.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Math-Italic.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Math-Regular.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Math-Regular.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Math-Regular.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Math-Regular.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_SansSerif-Bold.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_SansSerif-Bold.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_SansSerif-Bold.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_SansSerif-Bold.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_SansSerif-Italic.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_SansSerif-Italic.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_SansSerif-Italic.woff
Binary file not shown.
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_SansSerif-Regular.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_SansSerif-Regular.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Script-Regular.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Script-Regular.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Script-Regular.woff
Binary file not shown.
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size1-Regular.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size1-Regular.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size1-Regular.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size1-Regular.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size2-Regular.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size2-Regular.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size2-Regular.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size2-Regular.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size3-Regular.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size3-Regular.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size3-Regular.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size3-Regular.woff2
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size4-Regular.eot
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size4-Regular.ttf
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size4-Regular.woff
Binary file not shown.
Binary file removed doc/3rdparty/KaTeX/fonts/KaTeX_Size4-Regular.woff2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion doc/3rdparty/KaTeX/katex.min.css

This file was deleted.

6 changes: 0 additions & 6 deletions doc/3rdparty/KaTeX/katex.min.js

This file was deleted.

1 change: 0 additions & 1 deletion doc/3rdparty/googleCodePrettify/prettify.css

This file was deleted.

0 comments on commit f40c675

Please sign in to comment.