diff --git a/Makefile b/Makefile index 991ee6539ae120f75e9cdbbaa68afac95bb5b1ab..29f9bd7c39f4b7541c0056b6cc3a8636891daa04 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/conanfile.py b/conanfile.py index fb6a3a6a23e2b3d4818da7b2c7918fbc00f35027..6170fa516657f3cc89353aaff151b28b5a940d70 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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)