wip

recipes/qt/5.x.x/conanfile.py

@@ -492,20 +492,20 @@
             vre = VirtualRunEnv(self)
             vre.generate(scope="build")
         env = Environment()
+        env.define("MAKEFLAGS", f"j{build_jobs(self)}")
         env.define("ANGLE_DIR", self.angle_path)
         env.prepend_path("PKG_CONFIG_PATH", self.generators_folder)
         if self.settings.os == "Windows":
             env.prepend_path("PATH", os.path.join(self.source_folder, "qt5", "gnuwin32", "bin"))
         env.vars(self).save_script("conan_qt_env_file")
 
     def _make_program(self):
-        build_jobs = build_jobs(self)
         if is_msvc(self):
             return "jom"
         elif self._settings_build.os == "Windows":
             return "mingw32-make"
         else:
-            return f"make -j{build_jobs}"
+            return "make"
 
     def _xplatform(self):
         if self.settings.os == "Linux":
@@ -938,7 +938,7 @@
         filecontents += 'set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_GADGET_EXPORT" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT")\n'
         save(self, os.path.join(self.package_folder, self._cmake_core_extras_file), filecontents)
 
         def _create_private_module(module, dependencies=[]):
             if "Core" not in dependencies:
                 dependencies.append("Core")
             dependencies_string = ';'.join(f'Qt5::{dependency}' for dependency in dependencies)
@@ -1009,7 +1009,7 @@
                 reqs.append(corrected_req)
             return reqs
 
         def _create_module(module, requires=[], has_include_dir=True):
             componentname = f"qt{module}"
             assert componentname not in self.cpp_info.components, f"Module {module} already present in self.cpp_info.components"
             self.cpp_info.components[componentname].set_property("cmake_target_name", f"Qt5::{module}")