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

[sqlite-orm] Update to 1.6 #15517

Merged
merged 4 commits into from
Jan 11, 2021

Conversation

NancyLi1013
Copy link
Contributor

Describe the pull request

Update to latest version 1.6

Update patches

Note: All features have passed with the following triplets:

  • x86-windows
  • x64-windows-static

@NancyLi1013 NancyLi1013 added info:internal This PR or Issue was filed by the vcpkg team. category:port-update The issue is with a library, which is requesting update new revision labels Jan 8, 2021
@mikedld
Copy link

mikedld commented Jan 10, 2021

CMake config package seems to no longer be exported with this change.

@NancyLi1013
Copy link
Contributor Author

There is no cmake config file in this new version. The usage has been updated as the follows:

    find_path(SQLITE_ORM_INCLUDE_DIRS "sqlite_orm/sqlite_orm.h")
    target_include_directories(main PRIVATE ${SQLITE_ORM_INCLUDE_DIRS})

@mikedld
Copy link

mikedld commented Jan 11, 2021

It's certainly there (https://github.com/fnc12/sqlite_orm/blob/1.6/cmake/SqliteOrmConfig.cmake.in) and there's some export code there as well (https://github.com/fnc12/sqlite_orm/blob/1.6/packaging/CMakeLists.txt)...

@NancyLi1013
Copy link
Contributor Author

Thanks for your help. I have noticed this. Will update later.

@NancyLi1013 NancyLi1013 marked this pull request as draft January 11, 2021 06:08
@mikedld
Copy link

mikedld commented Jan 11, 2021

Tested on x64-osx, works like a charm ;) Thanks! Didn't test with x64-linux yet, but it's probably a safe bet this fixes #15555 as the exported config file is much cleaner now.

@NancyLi1013
Copy link
Contributor Author

Thanks for your test and attention. @mikedld
I have tested this on x64-linux and it can build fine now.

@NancyLi1013 NancyLi1013 marked this pull request as ready for review January 11, 2021 07:38
@NancyLi1013 NancyLi1013 requested a review from JackBoosY January 11, 2021 07:39
@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Jan 11, 2021
@vicroms vicroms merged commit 7959513 into microsoft:master Jan 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[sqlite-orm] Update to 1.6
4 participants