Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GeoModel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GeoModelDev
GeoModel
Commits
1dba7215
Commit
1dba7215
authored
5 years ago
by
Riccardo Maria Bianchi
Browse files
Options
Downloads
Patches
Plain Diff
update doxygen build for GeoModelCore
parent
97e9dfa0
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!2
CI: set Ubuntu and macOS pipelines for the new monorepo
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GeoModelCore/.gitlab-ci.yml
+3
-3
3 additions, 3 deletions
GeoModelCore/.gitlab-ci.yml
GeoModelCore/CMakeLists.txt
+4
-1
4 additions, 1 deletion
GeoModelCore/CMakeLists.txt
with
7 additions
and
4 deletions
GeoModelCore/.gitlab-ci.yml
+
3
−
3
View file @
1dba7215
...
...
@@ -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 . -- do
c
-
cmake --build . -- do
xy
-
cp -r doc_doxygen/html ../public
build_slc6
:
<<
:
*build_template
...
...
This diff is collapsed.
Click to expand it.
GeoModelCore/CMakeLists.txt
+
4
−
1
View file @
1dba7215
...
...
@@ -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
(
do
c
add_custom_target
(
do
xy
COMMAND
${
DOXYGEN_EXECUTABLE
}
${
DOXYGEN_OUT
}
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
COMMENT
"Generating API documentation with Doxygen"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment