Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-cpplib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
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
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
caosdb
Software
caosdb-cpplib
Commits
661b427f
Verified
Commit
661b427f
authored
1 year ago
by
Daniel Hornung
Browse files
Options
Downloads
Patches
Plain Diff
MAINT: Rename make target `conan-install` to `conan-install-deps`
parent
7c2addd9
No related branches found
No related tags found
1 merge request
!61
Release 0.3.0
Pipeline
#43088
failed
1 year ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Changes
1
Pipelines
37
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile
+6
-5
6 additions, 5 deletions
Makefile
with
6 additions
and
5 deletions
Makefile
+
6
−
5
View file @
661b427f
...
@@ -45,20 +45,21 @@ endif
...
@@ -45,20 +45,21 @@ endif
help
:
help
:
@
echo
"Targets:"
@
echo
"Targets:"
@
echo
" style - auto-format the source files."
@
echo
" style - auto-format the source files."
@
echo
" conan-install - Install locally with Conan."
@
echo
" conan-install
-deps
- Install
dependencies
locally with Conan."
@
echo
-e
" conan-create - Create
c
onan binary package in the local conan
\n
"
\
@
echo
-e
" conan-create - Create
C
onan binary package in the local conan
\n
"
\
" repostory."
" repostory."
@
echo
" conan - Install dependencies, then build and install package."
style
:
style
:
$(
CLANG_FORMAT
)
-i
--verbose
\
$(
CLANG_FORMAT
)
-i
--verbose
\
$$(
find
test
/ src/ include/
-type
f
-iname
"*.cpp"
-o
-iname
"*.h"
-o
-iname
"*.h.in"
)
$$(
find
test
/ src/ include/
-type
f
-iname
"*.cpp"
-o
-iname
"*.h"
-o
-iname
"*.h.in"
)
.PHONY
:
style
.PHONY
:
style
conan-install
:
conan-install
-deps
:
conan
install
.
-s
$(
CONAN_SETTINGS
)
||
\
conan
install
.
-s
$(
CONAN_SETTINGS
)
||
\
(
echo
"'conan install' failed, trying to build from sources..."
;
\
(
echo
"'conan install' failed, trying to build from sources..."
;
\
conan
install
.
-s
$(
CONAN_SETTINGS
)
--build
=
missing
)
conan
install
.
-s
$(
CONAN_SETTINGS
)
--build
=
missing
)
.PHONY
:
conan-install
.PHONY
:
conan-install
-deps
conan-install-debug
:
conan-install-debug
:
conan
install
.
-s
$(
CONAN_SETTINGS
)
-s
build_type
=
Debug
||
\
conan
install
.
-s
$(
CONAN_SETTINGS
)
-s
build_type
=
Debug
||
\
...
@@ -75,7 +76,7 @@ conan-create-debug:
...
@@ -75,7 +76,7 @@ conan-create-debug:
.PHONY
:
conan-create-debug
.PHONY
:
conan-create-debug
conan
:
conan-install conan-create
conan
:
conan-install
-deps
conan-create
.PHONY
:
conan
.PHONY
:
conan
doc
:
doc
:
...
...
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