Skip to content

Commit 7e31c2a

Browse files
committed
removed fmt because it comes with FMT
1 parent 8c8b359 commit 7e31c2a

1 file changed

Lines changed: 6 additions & 10 deletions

File tree

conanfile.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,18 @@
66
class HelloConan(ConanFile):
77
settings = 'os', 'compiler', 'build_type', 'arch'
88
generators = 'CMakeDeps', 'CMakeToolchain'
9-
default_options = {'fmt/*:header_only': True}
10-
11-
def config_options(self):
12-
if self.settings.get_safe('arch') == 'armv7':
13-
pass
14-
# options = Options()
15-
#options.values = conans.model.options.OptionsValues({'fmt/*:header_only': True})
16-
#self.options = options
9+
default_options = {'fmt/*:header_only': True, 'spdlog/*:header_only': True}
1710

1811
def configure(self):
12+
cmake = CMakeToolchain(self)
13+
cmake.user_presets_path = None
1914
if self.settings.get_safe('arch') == 'armv7':
2015
self.requires = conans.model.requires.Requirements(['fmt/10.0.0', 'sml/1.1.6'])
2116
else:
2217
self.requires = conans.model.requires.Requirements(['catch2/3.4.0', 'gtest/1.14.0', 'docopt.cpp/0.6.3',
23-
'fmt/10.0.0', 'spdlog/1.12.0', 'sml/1.1.8', 'nlohmann_json/3.11.2',
24-
'boost/1.81.0', 'crowcpp-crow/1.0+5', 'cppzmq/4.9.0', 'protobuf/3.21.12'])
18+
'spdlog/1.12.0', 'sml/1.1.8', 'nlohmann_json/3.11.2',
19+
'boost/1.81.0', 'crowcpp-crow/1.0+5', 'cppzmq/4.9.0',
20+
'protobuf/3.21.12'])
2521

2622
def build(self):
2723
cmake = CMakeToolchain(self)

0 commit comments

Comments
 (0)