Skip to content
Snippets Groups Projects
Commit a5b1719b authored by Daniel Hornung's avatar Daniel Hornung
Browse files

Merge remote-tracking branch 'origin/f-consolidation' into f-enum-utilities

parents 52081b05 bc673d29
No related branches found
No related tags found
2 merge requests!14ENH: New functions getEnumNameFromValue() and getEnumValueFromName(),!12F consolidation
Pipeline #12270 passed
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest

#12272

    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 5 additions and 4 deletions
    doc/CMakeLists.txt
    + 5
    − 4
    View file @ a5b1719b
    ...@@ -89,11 +89,12 @@ if (DOXYGEN_FOUND) ...@@ -89,11 +89,12 @@ if (DOXYGEN_FOUND)
    VERBATIM VERBATIM
    ) )
    # Copying files is necessary: https://stackoverflow.com/a/45808534/232888 # Copying files is necessary: https://stackoverflow.com/a/45808534/232888
    FILE(COPY # TODO fix for docs
    Examples.rst #FILE(COPY
    README_SETUP.md #Examples.rst
    #README_SETUP.md
    # Tutorial.rst # Tutorial.rst
    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") #DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
    else () else ()
    message("Sphinx need to be installed to generate the sphinx documentation") message("Sphinx need to be installed to generate the sphinx documentation")
    endif () endif ()
    ......
    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