From 714d02d2c34c237cdfc5da0a2b0f1061746cf342 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 1 Jul 2022 10:17:52 +0200
Subject: [PATCH] MAINT: update Makefile
---
.gitlab-ci.yml | 2 +-
Makefile | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abe6464..f437abb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,7 +85,7 @@ test:
- mkdir build
- cd build
- VERSION="$(conan inspect --raw version ..)"
- - conan install -s "compiler.libcxx=libstdc++11" -o build_acm=True .. "caosdb/$VERSION"
+ - conan install -s "compiler.libcxx=libstdc++11" -o build_acm=True .. "caosdb/$VERSION@_/_"
- cmake -DCMAKE_BUILD_TYPE=Debug ..
- cmake --build . -j
- cmake --build . -j --target unit_test_coverage
diff --git a/Makefile b/Makefile
index 544c803..21cd433 100644
--- a/Makefile
+++ b/Makefile
@@ -44,8 +44,10 @@ endif
.PHONY: help
help:
@echo "Targets:"
- @echo " conan-install - Install locally with Conan."
@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"\
+ " repostory."
style:
$(CLANG_FORMAT) -i --verbose \
@@ -65,11 +67,12 @@ conan-install-debug:
.PHONY: conan-install-debug
conan-create:
- conan create . -s $(CONAN_SETTINGS)
+ conan create -s $(CONAN_SETTINGS) -o caosdb:build_acm=True . "caosdb/$$(conan inspect --raw version .)@_/_"
.PHONY: conan-create
conan-create-debug:
- conan create . -s $(CONAN_SETTINGS) -s build_type=Debug
+ conan create -s $(CONAN_SETTINGS) -s build_type=Debug -o caosdb:build_acm=True . "caosdb/$$(conan inspect --raw version .)@_/_"
+
.PHONY: conan-create-debug
conan: conan-install conan-create
--
GitLab