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

MAINT: Rename make target `conan-install` to `conan-install-deps`

parent 7c2addd9
No related branches found
No related tags found
1 merge request!61Release 0.3.0
Pipeline #43088 failed
...@@ -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 conan binary package in the local conan\n"\ @echo -e " conan-create - Create Conan 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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment