Skip to content
Snippets Groups Projects
Commit bccf6187 authored by Joscha Schmiedt's avatar Joscha Schmiedt
Browse files

FIX: Adapt BUILD_ACM option for Conan 2.0

parent e3eedae6
Branches
Tags
2 merge requests!61Release 0.3.0,!49Resolve "EXTERN: Adapt to Conan 2"
Pipeline #52249 failed
Pipeline: caosdb-cppinttest

#52250

    ......@@ -68,11 +68,11 @@ conan-install-debug:
    .PHONY: conan-install-debug
    conan-create:
    conan create -s $(CONAN_SETTINGS) -o caosdb:build_acm=True .
    conan create -s $(CONAN_SETTINGS) -o caosdb/*:build_acm=True .
    .PHONY: conan-create
    conan-create-debug:
    conan create -s $(CONAN_SETTINGS) -s build_type=Debug -o caosdb:build_acm=True .
    conan create -s $(CONAN_SETTINGS) -s build_type=Debug -o caosdb/*:build_acm=True .
    .PHONY: conan-create-debug
    ......
    ......@@ -49,7 +49,8 @@ class CaosdbConan(ConanFile):
    def generate(self):
    tc = CMakeToolchain(self)
    # This writes the "conan_toolchain.cmake"
    if self.options.build_acm:
    tc.cache_variables["BUILD_ACM"] = "ON"
    tc.generate()
    cmake = CMakeDeps(self)
    ......@@ -66,10 +67,9 @@ class CaosdbConan(ConanFile):
    def build(self):
    cmake = CMake(self)
    if self.options.build_acm:
    cmake.definitions["BUILD_ACM"] = "On"
    cmake.configure()
    cmake.build(target=["all", "ccaosdbcli", "cxxcaosdbcli"])
    cmake.build(target=["all"]) # , "ccaosdbcli", "cxxcaosdbcli"])
    def package(self):
    cmake = CMake(self)
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment