[DO-1345] fixed windows packages (!16)
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/16 Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team> Co-committed-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team>
This commit is contained in:
committed by
Aleksandr Vodyanov
parent
3759e1163f
commit
a82e89a1bc
@@ -86,7 +86,7 @@ class QtConan(ConanFile):
|
||||
default_options = {
|
||||
"shared": False,
|
||||
"commercial": False,
|
||||
"opengl": "desktop",
|
||||
"opengl": "dynamic",
|
||||
"with_vulkan": False,
|
||||
"openssl": True,
|
||||
"with_pcre2": True,
|
||||
@@ -502,7 +502,7 @@ class QtConan(ConanFile):
|
||||
|
||||
def source(self):
|
||||
get(self, **self.conan_data["sources"][self.version],
|
||||
strip_root=True, destination="qt5")
|
||||
strip_root=True, destination="qt5")
|
||||
|
||||
apply_conandata_patches(self)
|
||||
for f in ["renderer", os.path.join("renderer", "core"), os.path.join("renderer", "platform")]:
|
||||
@@ -544,7 +544,7 @@ class QtConan(ConanFile):
|
||||
elif self._settings_build.os == "Windows":
|
||||
return "mingw32-make"
|
||||
else:
|
||||
return "make -j20"
|
||||
return "make"
|
||||
|
||||
def _xplatform(self):
|
||||
if self.settings.os == "Linux":
|
||||
@@ -882,7 +882,7 @@ class QtConan(ConanFile):
|
||||
save(self, ".qmake.super" , "")
|
||||
|
||||
self.run("%s %s" % (os.path.join(self.source_folder, "qt5", "configure"), " ".join(args)))
|
||||
self.run("make -j16")
|
||||
self.run(self._make_program())
|
||||
|
||||
@property
|
||||
def _cmake_core_extras_file(self):
|
||||
|
||||
Reference in New Issue
Block a user