Skip to content
Snippets Groups Projects
Verified Commit 714d02d2 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

MAINT: update Makefile

parent 23b34547
Branches
Tags
2 merge requests!42Release 0.2.0,!40F dot in username
Pipeline #25003 passed
Pipeline: caosdb-cppinttest

#25004

    ...@@ -85,7 +85,7 @@ test: ...@@ -85,7 +85,7 @@ test:
    - mkdir build - mkdir build
    - cd build - cd build
    - VERSION="$(conan inspect --raw version ..)" - 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 -DCMAKE_BUILD_TYPE=Debug ..
    - cmake --build . -j - cmake --build . -j
    - cmake --build . -j --target unit_test_coverage - cmake --build . -j --target unit_test_coverage
    ......
    ...@@ -44,8 +44,10 @@ endif ...@@ -44,8 +44,10 @@ endif
    .PHONY: help .PHONY: help
    help: help:
    @echo "Targets:" @echo "Targets:"
    @echo " conan-install - Install locally with Conan."
    @echo " style - auto-format the source files." @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: style:
    $(CLANG_FORMAT) -i --verbose \ $(CLANG_FORMAT) -i --verbose \
    ...@@ -65,11 +67,12 @@ conan-install-debug: ...@@ -65,11 +67,12 @@ conan-install-debug:
    .PHONY: conan-install-debug .PHONY: conan-install-debug
    conan-create: 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 .PHONY: conan-create
    conan-create-debug: 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 .PHONY: conan-create-debug
    conan: conan-install conan-create conan: conan-install conan-create
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment