From 9ed731f2ddac0084db1df176249c5b479be3c90f Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Sun, 18 Jun 2023 08:47:43 -0700 Subject: [PATCH] Change dependency specification to conan 2.0 syntax --- conanfile.py | 70 ++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/conanfile.py b/conanfile.py index 567c8678..42694d8b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,4 +1,4 @@ -from conans import ConanFile, CMake +from conan import ConanFile class CryFSConan(ConanFile): settings = "os", "compiler", "build_type", "arch" @@ -9,38 +9,38 @@ class CryFSConan(ConanFile): ] generators = "cmake" default_options = { - "boost:system_no_deprecated": True, - "boost:asio_no_deprecated": True, - "boost:filesystem_no_deprecated": True, - "boost:without_atomic": False, # needed by boost thread - "boost:without_chrono": False, # needed by CryFS - "boost:without_container": False, # needed by boost thread - "boost:without_context": True, - "boost:without_contract": True, - "boost:without_coroutine": True, - "boost:without_date_time": False, # needed by boost thread - "boost:without_exception": False, # needed by boost thread - "boost:without_fiber": True, - "boost:without_filesystem": False, # needed by CryFS - "boost:without_graph": True, - "boost:without_graph_parallel": True, - "boost:without_iostreams": True, - "boost:without_json": True, - "boost:without_locale": True, - "boost:without_log": True, - "boost:without_math": True, - "boost:without_mpi": True, - "boost:without_nowide": True, - "boost:without_program_options": False, # needed by CryFS - "boost:without_python": True, - "boost:without_random": True, - "boost:without_regex": True, - "boost:without_serialization": False, # needed by boost date_time - "boost:without_stacktrace": True, - "boost:without_system": False, # needed by CryFS - "boost:without_test": True, - "boost:without_thread": False, # needed by CryFS - "boost:without_timer": True, - "boost:without_type_erasure": True, - "boost:without_wave": True, + "boost/*:system_no_deprecated": True, + "boost/*:asio_no_deprecated": True, + "boost/*:filesystem_no_deprecated": True, + "boost/*:without_atomic": False, # needed by boost thread + "boost/*:without_chrono": False, # needed by CryFS + "boost/*:without_container": False, # needed by boost thread + "boost/*:without_context": True, + "boost/*:without_contract": True, + "boost/*:without_coroutine": True, + "boost/*:without_date_time": False, # needed by boost thread + "boost/*:without_exception": False, # needed by boost thread + "boost/*:without_fiber": True, + "boost/*:without_filesystem": False, # needed by CryFS + "boost/*:without_graph": True, + "boost/*:without_graph_parallel": True, + "boost/*:without_iostreams": True, + "boost/*:without_json": True, + "boost/*:without_locale": True, + "boost/*:without_log": True, + "boost/*:without_math": True, + "boost/*:without_mpi": True, + "boost/*:without_nowide": True, + "boost/*:without_program_options": False, # needed by CryFS + "boost/*:without_python": True, + "boost/*:without_random": True, + "boost/*:without_regex": True, + "boost/*:without_serialization": False, # needed by boost date_time + "boost/*:without_stacktrace": True, + "boost/*:without_system": False, # needed by CryFS + "boost/*:without_test": True, + "boost/*:without_thread": False, # needed by CryFS + "boost/*:without_timer": True, + "boost/*:without_type_erasure": True, + "boost/*:without_wave": True, }