diff --git a/Makefile b/Makefile index 4be361a56cb09fa5359d5ef03ccff3064b2e4e3d..9a4abd9173578cbffc7a7b7260e8a681101fc5a6 100644 --- a/Makefile +++ b/Makefile @@ -45,20 +45,21 @@ endif help: @echo "Targets:" @echo " style - auto-format the source files." - @echo " conan-install - Install locally with Conan." - @echo -e " conan-create - Create conan binary package in the local conan\n"\ + @echo " conan-install-deps - Install dependencies locally with Conan." + @echo -e " conan-create - Create Conan binary package in the local conan\n"\ " repostory." + @echo " conan - Install dependencies, then build and install package." style: $(CLANG_FORMAT) -i --verbose \ $$(find test/ src/ include/ -type f -iname "*.cpp" -o -iname "*.h" -o -iname "*.h.in") .PHONY: style -conan-install: +conan-install-deps: conan install . -s $(CONAN_SETTINGS) || \ (echo "'conan install' failed, trying to build from sources..."; \ conan install . -s $(CONAN_SETTINGS) --build=missing) -.PHONY: conan-install +.PHONY: conan-install-deps conan-install-debug: conan install . -s $(CONAN_SETTINGS) -s build_type=Debug || \ @@ -75,7 +76,7 @@ conan-create-debug: .PHONY: conan-create-debug -conan: conan-install conan-create +conan: conan-install-deps conan-create .PHONY: conan doc: