changed logic for setting up QT env variable

StephanKa · Mar 4, 2024 · 2b2135f · 2b2135f
1 parent d5f3650
commit 2b2135f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -13,7 +13,7 @@
       "binaryDir": "${sourceDir}/out/build/${presetName}",
       "installDir": "${sourceDir}/out/install/${presetName}",
       "environment": {
-        "DONT_CONFIGURE_QT": "1"
+        "CONFIGURE_QT": "0"
       },
       "cacheVariables": {
         "CPP_STARTER_USE_SML": "ON",
@@ -423,7 +423,7 @@
       },
       "environment": {
         "NOT_ON_C3I": "1",
-        "DONT_CONFIGURE_QT": "0"
+        "CONFIGURE_QT": "1"
       }
     }
   ],

diff --git a/conanfile.py b/conanfile.py
@@ -17,15 +17,15 @@ def configure(self):
             self.requires = conans.model.requires.Requirements(['fmt/10.0.0', 'sml/1.1.6'])
             return
 
-        if os.getenv("DONT_CONFIGURE_QT") == '1':
+        if os.getenv("CONFIGURE_QT") == '1':
+            self.requires = conans.model.requires.Requirements(['catch2/3.4.0', 'docopt.cpp/0.6.3', 'gtest/1.14.0',
+                                                                'qt/6.6.1', 'spdlog/1.12.0'])
+        else:
             requirement = ['catch2/3.4.0', 'gtest/1.14.0', 'docopt.cpp/0.6.3',
                            'spdlog/1.12.0', 'sml/1.1.8', 'nlohmann_json/3.11.2',
                            'boost/1.83.0', 'crowcpp-crow/1.0+5', 'cppzmq/4.9.0',
                            'protobuf/3.21.12']
             self.requires = conans.model.requires.Requirements(requirement)
-        else:
-            self.requires = conans.model.requires.Requirements(['catch2/3.4.0', 'docopt.cpp/0.6.3', 'gtest/1.14.0',
-                                                                'qt/6.6.1', 'spdlog/1.12.0'])
 
     def build(self):
         cmake = CMakeToolchain(self)