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.

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

Jump to bottom

[libmariadb] Fix ambiguous cmake call #41746

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −1
Draft

[libmariadb] Fix ambiguous cmake call #41746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions ports/libmariadb/cmake-ambiguous-keyword.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/cmake/plugins.cmake b/cmake/plugins.cmake
index de5c12c..f433859 100644
--- a/cmake/plugins.cmake
+++ b/cmake/plugins.cmake
@@ -15,11 +15,14 @@ FUNCTION(REGISTER_PLUGIN)
SET(one_value_keywords TARGET DISABLED TYPE DEFAULT)
SET(multi_value_keywords CONFIGURATIONS SOURCES LIBRARIES INCLUDES COMPILE_OPTIONS)

+ # https://github.com/microsoft/vcpkg/issues/41719
+ string(REPLACE ";DEFAULT;DEFAULT;" ";vcpkg_value_DEFAULT;DEFAULT;" ARGN "${ARGN}")
cmake_parse_arguments(CC_PLUGIN
"${options}"
"${one_value_keywords}"
"${multi_value_keywords}"
${ARGN})
+ string(REPLACE "vcpkg_value_DEFAULT" "DEFAULT" CC_PLUGIN_CONFIGURATIONS "${CC_PLUGIN_CONFIGURATIONS}")

# overwrite default if it was specified with cmake option
string(TOUPPER ${CC_PLUGIN_TARGET} cc_plugin)
1 change: 1 addition & 0 deletions ports/libmariadb/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ vcpkg_from_github(
SHA512 396ce2a36937d49ec96eb239312118c736f46383d2906b7142d9695e795f310af28255d8827cc98ad76ae4e6d5a22faf1188b7dd286791e3c85f22c96d0114b3
HEAD_REF 3.4
PATCHES
cmake-ambiguous-keyword.diff
compiler-flags.diff
dependencies.diff
disable-mariadb_config.diff
Expand Down
1 change: 1 addition & 0 deletions ports/libmariadb/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "libmariadb",
"version-semver": "3.4.1",
"port-version": 1,
"description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases",
"homepage": "https://github.com/mariadb-corporation/mariadb-connector-c",
"license": "LGPL-2.1-or-later",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4758,7 +4758,7 @@
},
"libmariadb": {
"baseline": "3.4.1",
"port-version": 0
"port-version": 1
},
"libmaxminddb": {
"baseline": "1.11.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libmariadb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1a0ded7227a50f4a953d3b81be2f63b5db3c21a4",
"version-semver": "3.4.1",
"port-version": 1
},
{
"git-tree": "052df42a61bbe15831197f9adbafcf4da7f6fcc6",
"version-semver": "3.4.1",
Expand Down