Skip to content

(#14217) qwt: Fix unresolvable conflict #14245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

(#14217) qwt: Fix unresolvable conflict #14245

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b7cd09
(#14217) qwt: Fix unresolvable conflict
EstebanDugueperoux2 Nov 16, 2022
bc51d86
(#14217) qwt: Take into account SpaceIm remark
EstebanDugueperoux2 Nov 17, 2022
d1ba590
Merge branch 'master' into master
EstebanDugueperoux2 Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions recipes/qwt/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ class QwtConan(ConanFile):
"test": False
}

tool_requires = (
"cmake/3.24.2",
"ninja/1.11.1"
)

def _patch_sources(self):
apply_conandata_patches(self)

Expand All @@ -65,7 +60,9 @@ def requirements(self):
def build_requirements(self):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you move build_requirements after validate() please?

Also:

  • move config_options & configure before requirements
  • use rm_safe to delete fPIC in configure and bump required_conan_version to 1.53.0
  • use export_conandata_patches in export_sources
  • extract apply_conandata_patches and call it at the beginning of build()

if self.settings.os == "Windows" and self.settings.compiler == "Visual Studio":
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if self.settings.os == "Windows" and self.settings.compiler == "Visual Studio":
if is_msvc(self):

and add from conan.tools.microsoft import is_msvc

self.build_requires("jom/1.1.3")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.build_requires("jom/1.1.3")
self.tool_requires("jom/1.1.3")

self.tool_requires("qt/5.15.7")
self.tool_requires("qt/5.15.7")
self.tool_requires("cmake/3.24.2")
self.tool_requires("ninja/1.11.1")

def validate(self):
if hasattr(self, "settings_build") and cross_building(self, skip_x64_x86=True):
Expand Down