Skip to content

Commit 2b2135f

Browse files
committed
changed logic for setting up QT env variable
1 parent d5f3650 commit 2b2135f

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

CMakePresets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"binaryDir": "${sourceDir}/out/build/${presetName}",
1414
"installDir": "${sourceDir}/out/install/${presetName}",
1515
"environment": {
16-
"DONT_CONFIGURE_QT": "1"
16+
"CONFIGURE_QT": "0"
1717
},
1818
"cacheVariables": {
1919
"CPP_STARTER_USE_SML": "ON",
@@ -423,7 +423,7 @@
423423
},
424424
"environment": {
425425
"NOT_ON_C3I": "1",
426-
"DONT_CONFIGURE_QT": "0"
426+
"CONFIGURE_QT": "1"
427427
}
428428
}
429429
],

conanfile.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ def configure(self):
1717
self.requires = conans.model.requires.Requirements(['fmt/10.0.0', 'sml/1.1.6'])
1818
return
1919

20-
if os.getenv("DONT_CONFIGURE_QT") == '1':
20+
if os.getenv("CONFIGURE_QT") == '1':
21+
self.requires = conans.model.requires.Requirements(['catch2/3.4.0', 'docopt.cpp/0.6.3', 'gtest/1.14.0',
22+
'qt/6.6.1', 'spdlog/1.12.0'])
23+
else:
2124
requirement = ['catch2/3.4.0', 'gtest/1.14.0', 'docopt.cpp/0.6.3',
2225
'spdlog/1.12.0', 'sml/1.1.8', 'nlohmann_json/3.11.2',
2326
'boost/1.83.0', 'crowcpp-crow/1.0+5', 'cppzmq/4.9.0',
2427
'protobuf/3.21.12']
2528
self.requires = conans.model.requires.Requirements(requirement)
26-
else:
27-
self.requires = conans.model.requires.Requirements(['catch2/3.4.0', 'docopt.cpp/0.6.3', 'gtest/1.14.0',
28-
'qt/6.6.1', 'spdlog/1.12.0'])
2929

3030
def build(self):
3131
cmake = CMakeToolchain(self)

0 commit comments

Comments
 (0)