Skip to content
Snippets Groups Projects
Commit b6c6669e authored by Joscha Schmiedt's avatar Joscha Schmiedt
Browse files

FIX: Update make doc for Conan 2

parent 11325c25
Branches
Tags
2 merge requests!61Release 0.3.0,!49Resolve "EXTERN: Adapt to Conan 2"
Pipeline #53577 failed
Pipeline: caosdb-julialib

#53582

    Pipeline: CaosDB Octave library

    #53581

      Pipeline: caosdb-cppinttest

      #53579

        ......@@ -79,11 +79,12 @@ conan-create-debug:
        conan: conan-install-deps conan-create
        .PHONY: conan
        doc:
        doc: conan-install-deps
        @doxygen --version || ( echo "Doxygen not found. Please install Doxygen first." ; exit 1 )
        mkdir -p build && cd build && conan install .. --build=missing -s $(CONAN_SETTINGS) \
        && cmake .. && cmake --build . --target doc-sphinx \
        && echo "The documentation starts at build/doc/sphinx_out/index.html ."
        cd build/Release\
        && cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE="generators/conan_toolchain.cmake" -DCMAKE_INSTALL_PREFIX="/home/joscha/caosdb/src/caosdb-cpplib" -DCMAKE_POLICY_DEFAULT_CMP0091="NEW" -DCMAKE_BUILD_TYPE="Release" ../.. \
        && cmake --build . --target doc-sphinx \
        && echo "The documentation starts at build/Release/doc/sphinx_out/index.html ."
        .PHONY: doc
        conan-debug: conan-install-debug conan-create-debug
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment