Skip to content
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.

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

wil: recipe added #16701

Merged
merged 19 commits into from
Apr 11, 2023
Merged

wil: recipe added #16701

merged 19 commits into from
Apr 11, 2023

Conversation

elejke
Copy link
Contributor

@elejke elejke commented Mar 25, 2023

Specify library name and version: wil/1.0.230202.1

It is a dependency of the onnxruntime library on Windows: #4806

I've managed to build onnxruntime/1.7.1 on windows from the above PR with this lib added.


@CLAassistant
Copy link

CLAassistant commented Mar 25, 2023

CLA assistant check
All committers have signed the CLA.

@conan-center-bot

This comment has been minimized.

1 similar comment
@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@prince-chrismc
Copy link
Contributor

Make sure to comment in #4 for access

@conan-center-bot

This comment has been minimized.

@mayeut mayeut mentioned this pull request Apr 1, 2023
3 tasks
@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@elejke
Copy link
Contributor Author

elejke commented Apr 2, 2023

microsoft/wil#302

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

prince-chrismc
prince-chrismc previously approved these changes Apr 10, 2023
@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 23 (c75ae5edd5d8e15be395f088fe571f7892fdcb30):

  • wil/1.0.230202.1@:
    All packages built successfully! (All logs)

Conan v2 pipeline (informative, not required for merge) ✔️

Note: Conan v2 builds are informative and they are not required for the PR to be merged.

All green in build 22 (c75ae5edd5d8e15be395f088fe571f7892fdcb30):

  • wil/1.0.230202.1@:
    All packages built successfully! (All logs)

@conan-center-bot conan-center-bot merged commit 0d8aeb4 into conan-io:master Apr 11, 2023
MartinDelille pushed a commit to MartinDelille/conan-center-index that referenced this pull request Apr 12, 2023
* wil recipe added

* fix test_package

* added _min_cpp to the recipe

* fixed layot

* fixes

* removed camke_module_file_name/cmake_module_target_name

* added patch for type conversion

* Update 1.0.230202.1-0001-fix-type-conversion.patch

* Update recipes/wil/all/conanfile.py

Co-authored-by: Chris Mc <[email protected]>

* Update recipes/wil/all/test_package/CMakeLists.txt

Co-authored-by: Chris Mc <[email protected]>

* Update conanfile.py

* fix patch type and added source

* removed gcc and clang from _compilers_min_version

* fixed test_package.cpp

* changed type of patch to bugfix

* fixup: patch type should be portability since it adds support for vs 2017

---------

Co-authored-by: Chris Mc <[email protected]>
def _compilers_minimum_version(self):
return {
"Visual Studio": "15",
"msvc": "14.1"
Copy link
Contributor

Choose a reason for hiding this comment

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

this msvc value is incorrect, it should be 191

Comment on lines +41 to +43
# About compiler version: https://github.com/microsoft/wil/issues/207#issuecomment-991722592
def export_sources(self):
export_conandata_patches(self)
Copy link
Contributor

Choose a reason for hiding this comment

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

why this comment is attached to export_sources?

Comment on lines +85 to +93
# https://github.com/microsoft/wil/blob/56e3e5aa79234f8de3ceeeaf05b715b823bc2cca/CMakeLists.txt#L53
self.cpp_info.set_property("cmake_file_name", "WIL")
self.cpp_info.set_property("cmake_target_name", "WIL::WIL")

# TODO: to remove in conan v2 once cmake_find_package_* generators removed
self.cpp_info.filenames["cmake_find_package"] = "WIL"
self.cpp_info.filenames["cmake_find_package_multi"] = "WIL"
self.cpp_info.names["cmake_find_package"] = "WIL"
self.cpp_info.names["cmake_find_package_multi"] = "WIL"
Copy link
Contributor

@SpaceIm SpaceIm Apr 13, 2023

Choose a reason for hiding this comment

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

If I follow this link, I see that config file name is incorrect here, it should be lowercase:

        self.cpp_info.set_property("cmake_file_name", "wil")
        self.cpp_info.set_property("cmake_target_name", "WIL::WIL")

        # TODO: to remove in conan v2 once cmake_find_package_* generators removed
        self.cpp_info.filenames["cmake_find_package"] = "wil"
        self.cpp_info.filenames["cmake_find_package_multi"] = "wil"
        self.cpp_info.names["cmake_find_package"] = "WIL"
        self.cpp_info.names["cmake_find_package_multi"] = "WIL"

Copy link
Contributor

Choose a reason for hiding this comment

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

I must have missed the _LOWER when I was reading it 😞

prince-chrismc added a commit that referenced this pull request Apr 13, 2023
@prince-chrismc
Copy link
Contributor

Good call outs #17021 👍

conan-center-bot pushed a commit that referenced this pull request Apr 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants