diff --git a/Makefile b/Makefile index c0de80b1..5e48c267 100644 --- a/Makefile +++ b/Makefile @@ -72,10 +72,12 @@ CC_DOCKER_FILE?=utils/docker/images/lthn-chain/Dockerfile all: help testnet: - cmake --workflow testnet + $(MAKE) configure TESTNET=1 + CONAN_HOME=$(CONAN_CACHE) $(CONAN_EXECUTABLE) build . mainnet: - cmake --workflow mainnet + $(MAKE) configure TESTNET=0 + CONAN_HOME=$(CONAN_CACHE) $(CONAN_EXECUTABLE) build . release: docs build (cd $(BUILD_FOLDER) && cpack) diff --git a/conanfile.py b/conanfile.py index 69cd53e7..40e10f35 100644 --- a/conanfile.py +++ b/conanfile.py @@ -21,6 +21,10 @@ class BlockchainConan(ConanFile): "boost/*:without_test": True } + tool_requires = [ + "cmake/3.31.9" + ] + requires = [ "zlib/1.3.1", "boost/1.85.0",