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

[sqlite3] Add more features #23009

Merged
merged 11 commits into from
Feb 16, 2022
Merged

[sqlite3] Add more features #23009

merged 11 commits into from
Feb 16, 2022

Conversation

JackBoosY
Copy link
Contributor

@JackBoosY JackBoosY commented Feb 9, 2022

Add the official features according to the official configure:

  • FTS3
  • FTS4
  • FTS5
  • MEMSYS3
  • MEMSYS5
  • MATH FUNCTIONS
  • LIMIT
  • RTREE
  • SESSION
  • OMIT LOAD EXTENSIONS
  • ZLIB

Add system macro SQLITE_OS_WIN and SQLITE_OS_UNIX.

Fixes #23000.

@JackBoosY JackBoosY added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:internal This PR or Issue was filed by the vcpkg team. labels Feb 9, 2022
@JackBoosY
Copy link
Contributor Author

@gmilletAVS Can you please test this PR?

Thanks.

else()
message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}")
endif()
else()
set(API "-DSQLITE_API=extern")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reason:

F:\vcpkg\buildtrees\sqlite3\src\3370100-a1573e1602.clean\sqlite3.c(172381): error C2159: more than one storage class specified
F:\vcpkg\buildtrees\sqlite3\src\3370100-a1573e1602.clean\sqlite3.c(214917): error C2159: more than one storage class specified

Souce code:

#ifdef SQLITE_DEBUG
SQLITE_API extern int sqlite3_fts5_may_be_corrupt;
# define assert_nc(x) assert(sqlite3_fts5_may_be_corrupt || (x))
#else
# define assert_nc(x) assert(x)
#endif

@JackBoosY JackBoosY added the category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly label Feb 10, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/libspatialite/vcpkg.json
  • ports/vcpkg-pkgconfig-get-modules/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/libspatialite/vcpkg.json
  • ports/vcpkg-pkgconfig-get-modules/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

@JackBoosY JackBoosY added info:reviewed Pull Request changes follow basic guidelines and removed depends:different-pr This PR or Issue depends on a PR which has been filed labels Feb 14, 2022
@vicroms vicroms merged commit 7f3e168 into microsoft:master Feb 16, 2022
@JackBoosY JackBoosY deleted the dev/jack/23000 branch February 17, 2022 06:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly 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.

[sqlite3] Add support for FTS (needed by QT Assistant)
3 participants