diff --git a/GeoModelCore/.gitlab-ci.yml b/GeoModelCore/.gitlab-ci.yml index 0991838033c7fb838bb2415716ef69c5b99d3abb..01bd072504d072a97fdf3484ff0d5829574c06bc 100644 --- a/GeoModelCore/.gitlab-ci.yml +++ b/GeoModelCore/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - build - deploy -# we want this to be used only in the build stage, not deploy, +# we want this to be used only in the build stage, not deploy, # so we make it part of the build template .before_script_template: &build_setup-build before_script: @@ -27,9 +27,9 @@ variables: - cmake ${CMAKE_ARGS} .. - cmake --build . -- -j$(nproc) - cmake --build . -- install - - cmake --build . -- doc + - cmake --build . -- doxy - cp -r doc_doxygen/html ../public - + build_slc6: <<: *build_template diff --git a/GeoModelCore/CMakeLists.txt b/GeoModelCore/CMakeLists.txt index 030acd8f82a73065c71220add0b4c951de2cd07c..f032936f111f7ceec4709580277e68358554c0e5 100644 --- a/GeoModelCore/CMakeLists.txt +++ b/GeoModelCore/CMakeLists.txt @@ -91,6 +91,9 @@ include( GeoModelCorePackaging ) # We want to build the documentation only if we run "make doc" # first we can indicate the documentation build as an option and set it to ON by default +# TODO: this option is not used at the moment; the doc target is called through 'make doc'; +# do we want to build the doxygen as 'cmake -DBUILD_DOC ..' ? +# If not, probably we can remove this option... option(BUILD_DOC "Build documentation" ON) # check if Doxygen is installed @@ -106,7 +109,7 @@ if (DOXYGEN_FOUND) # note: # - `make doc` builds the Doxygen docs on request # - `make all` allows to build the docs together with the application - add_custom_target( doc + add_custom_target( doxy COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating API documentation with Doxygen"