mirror/TinyORM
1
0
Fork 0
mirror of https://github.com/silverqx/TinyORM.git synced 2026-01-06 10:59:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

qmake used LIBS_PRIVATE for MySQL C connector

Browse Source
This commit is contained in:
silverqx
2023-08-11 14:51:12 +02:00
parent ac299bc199
commit b77553fc03
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
conf.pri.example
View File

@@ -127,19 +127,19 @@ win32-g++|win32-clang-g++ {
# PKGCONFIG *= libmariadb
# }
# else: \
# LIBS += -lmariadb
# LIBS_PRIVATE += -lmariadb
# }
# # Static build
# else: \
# if(CONFIG(static, dll|shared|static|staticlib) | \
# CONFIG(staticlib, dll|shared|static|staticlib)): \
# LIBS += -lmariadb.dll
# LIBS_PRIVATE += -lmariadb.dll
# Or add manually (use only one method, above or this manual method)
# # For shared build
# LIBS += -lmariadb
# LIBS_PRIVATE += -lmariadb
# # For static build
# LIBS += -lmariadb.dll
# LIBS_PRIVATE += -lmariadb.dll
}
}
@@ -172,8 +172,8 @@ else:win32-msvc|win32-clang-msvc {
# tiny_add_system_includepath(\
# $$quote(C:/Program Files/MySQL/MySQL Server 8.1/include/))
# LIBS += $$quote(-LC:/Program Files/MySQL/MySQL Server 8.1/lib/)
# LIBS += -llibmysql
# LIBS_PRIVATE += $$quote(-LC:/Program Files/MySQL/MySQL Server 8.1/lib/)
# LIBS_PRIVATE += -llibmysql
}
}
@@ -211,12 +211,12 @@ else:unix {
# }
# else: \
# # Pick only one
# LIBS += -lmysqlclient
## LIBS += -lmariadb
# LIBS_PRIVATE += -lmysqlclient
## LIBS_PRIVATE += -lmariadb
# Or add manually (use only one method, above or this manual method)
# Pick only one
# LIBS += -lmysqlclient
# LIBS += -lmariadb
# LIBS_PRIVATE += -lmysqlclient
# LIBS_PRIVATE += -lmariadb
}
}

18
qmake/features/tiny_find_packages.prf
View File

@@ -44,8 +44,8 @@ defineTest(tiny_find_mysql_mingw) {
export(PKGCONFIG)
}
else {
LIBS += -lmariadb
export(LIBS)
LIBS_PRIVATE += -lmariadb
export(LIBS_PRIVATE)
}
}
@@ -53,8 +53,8 @@ defineTest(tiny_find_mysql_mingw) {
else: \
CONFIG(static, dll|shared|static|staticlib) | \
CONFIG(staticlib, dll|shared|static|staticlib) {
LIBS += -lmariadb.dll
export(LIBS)
LIBS_PRIVATE += -lmariadb.dll
export(LIBS_PRIVATE)
}
}
@@ -77,13 +77,13 @@ defineTest(tiny_find_mysql_win32) {
tiny_add_system_includepath($$TINY_MYSQL_INCLUDE)
LIBS += -L$$TINY_MYSQL_LIB
LIBS += -llibmysql
LIBS_PRIVATE += -L$$TINY_MYSQL_LIB
LIBS_PRIVATE += -llibmysql
export(TINY_MYSQL_ROOT)
export(TINY_MYSQL_INCLUDE)
export(TINY_MYSQL_LIB)
export(LIBS)
export(LIBS_PRIVATE)
}
# Find the MySQL C library for UNIX platform.
@@ -97,8 +97,8 @@ defineTest(tiny_find_mysql_unix) {
export(PKGCONFIG)
}
else {
LIBS += -lmysqlclient
export(LIBS)
LIBS_PRIVATE += -lmysqlclient
export(LIBS_PRIVATE)
}
}