Skip to content

Commit f0744d7

Browse files
committed
added QT6
1 parent dbd4e3f commit f0744d7

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

CMakePresets.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
"hidden": true,
1313
"binaryDir": "${sourceDir}/out/build/${presetName}",
1414
"installDir": "${sourceDir}/out/install/${presetName}",
15+
"environment": {
16+
"NOT_ON_C3I": "1"
17+
},
1518
"cacheVariables": {
1619
"CPP_STARTER_USE_SML": "ON",
1720
"CPP_STARTER_USE_BOOST_BEAST": "ON",

conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
class HelloConan(ConanFile):
77
settings = 'os', 'compiler', 'build_type', 'arch'
88
generators = 'CMakeDeps', 'CMakeToolchain'
9-
default_options = {'fmt/*:header_only': True, 'spdlog/*:header_only': True}
9+
default_options = {'fmt/*:header_only': True, 'spdlog/*:header_only': True, 'qt/*:with_fontconfig': False}
1010

1111
def configure(self):
1212
cmake = CMakeToolchain(self)
@@ -17,7 +17,7 @@ def configure(self):
1717
self.requires = conans.model.requires.Requirements(['catch2/3.4.0', 'gtest/1.14.0', 'docopt.cpp/0.6.3',
1818
'spdlog/1.12.0', 'sml/1.1.8', 'nlohmann_json/3.11.2',
1919
'boost/1.83.0', 'crowcpp-crow/1.0+5', 'cppzmq/4.9.0',
20-
'protobuf/3.21.12'])
20+
'protobuf/3.21.12', 'qt/6.6.1'])
2121

2222
def build(self):
2323
cmake = CMakeToolchain(self)

0 commit comments

Comments
 (0)