generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-01 01:16:55 +02:00
Code Issues Projects Releases Wiki Activity

Gradle udpate

Browse Source
This commit is contained in:
zosrothko 2018-05-02 15:49:58 +02:00
parent 090d24dce4
commit 821a88dd1a
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Data/MySQL/build.gradle
View File

@ -83,24 +83,18 @@ model {
binaries { binaries {
all { all {
cppCompiler.define "THREADSAFE" cppCompiler.define "THREADSAFE"
if (toolChain in VisualCpp) { if (toolChain in VisualCpp) {
cppCompiler.define "WINVER=0x0600" cppCompiler.define "WINVER=0x0600"
cppCompiler.define "__LCC__" cppCompiler.define "__LCC__"
} }
/*
SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient
INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include
SYSFLAGS += -DTHREADSAFE -DNO_TCL
*/
if (toolChain in Gcc) { if (toolChain in Gcc) {
def String LIB64SUFFIX = "64"
cppCompiler.define "NO_TCL" cppCompiler.define "NO_TCL"
cppCompiler.args ( "-I", "/usr/local/include/mysql/" ) cppCompiler.args ( "-I", "/usr/local/include/mysql/" )
cppCompiler.args ( "-I", "/usr/include/mysql/" ) cppCompiler.args ( "-I", "/usr/include/mysql/" )
cppCompiler.args ( "-I", "/usr/mysql/include/mysql" ) cppCompiler.args ( "-I", "/usr/mysql/include/mysql" )
cppCompiler.args ( "-I", "/usr/local/mysql/include" ) cppCompiler.args ( "-I", "/usr/local/mysql/include" )
linker.args "-L/usr/local/lib$LIB64SUFFIX/mysql -L/usr/lib$LIB64SUFFIX/mysql -L/usr/mysql/lib$LIB64SUFFIX -L/usr/mysql/lib$LIB64SUFFIX/mysql -L/usr/local/mysql/lib$LIB64SUFFIX -lmysqlclient"
} }
} }

17
Data/MySQL/testsuite/build.gradle
View File

@ -28,7 +28,7 @@ model {
srcDir 'src' srcDir 'src'
} }
lib project: ':CppUnit', library: 'CppUnit', linkage: 'shared' lib project: ':CppUnit', library: 'CppUnit', linkage: 'shared'
lib project: ':Data:MySQL', library: 'mysql', linkage: 'shared' // lib project: ':Data:MySQL', library: 'mysql', linkage: 'shared'
lib project: ':Data:MySQL', library: 'DataMySQL', linkage: 'shared' lib project: ':Data:MySQL', library: 'DataMySQL', linkage: 'shared'
lib project: ':Data', library: 'Data', linkage: 'shared' lib project: ':Data', library: 'Data', linkage: 'shared'
lib project: ':Util', library: 'Util' lib project: ':Util', library: 'Util'
@ -48,11 +48,11 @@ model {
all { all {
cppCompiler.define "THREADSAFE" cppCompiler.define "THREADSAFE"
cppCompiler.define "__LCC__" cppCompiler.define "__LCC__"
cppCompiler.define "WINVER=0x0600"
} }
withType(org.gradle.nativeplatform.test.cppunit.CppUnitTestSuiteBinarySpec) { withType(org.gradle.nativeplatform.test.cppunit.CppUnitTestSuiteBinarySpec) {
lib project: ':CppUnit', library: 'CppUnit', linkage: 'shared' lib project: ':CppUnit', library: 'CppUnit', linkage: 'shared'
if (toolChain in VisualCpp) { if (toolChain in VisualCpp) {
cppCompiler.define "WINVER=0x0600"
if (buildType == buildTypes.debug) { if (buildType == buildTypes.debug) {
cCompiler.args "/MDd" cCompiler.args "/MDd"
cppCompiler.args "/MDd" cppCompiler.args "/MDd"
@ -65,6 +65,19 @@ model {
} }
} }
if (toolChain in Gcc) { if (toolChain in Gcc) {
def String LIB64SUFFIX = "64"
cppCompiler.define "NO_TCL"
cppCompiler.args ( "-I", "/usr/local/include/mysql/" )
cppCompiler.args ( "-I", "/usr/include/mysql/" )
cppCompiler.args ( "-I", "/usr/mysql/include/mysql" )
cppCompiler.args ( "-I", "/usr/local/mysql/include" )
linker.args ( "-L", "/usr/lib/x86_64-linux-gnu")
linker.args ( "-L", "/usr/local/lib$LIB64SUFFIX/mysql" )
linker.args ( "-L", "/usr/lib$LIB64SUFFIX/mysql" )
linker.args ( "-L", "/usr/mysql/lib$LIB64SUFFIX" )
linker.args ( "-L", "/usr/mysql/lib$LIB64SUFFIX/mysql" )
linker.args ( "-L", "/usr/local/mysql/lib$LIB64SUFFIX" )
linker.args ( "-l", "mysqlclient" )
} }
} }
} }

2
build.gradle
View File

@ -463,7 +463,7 @@ subprojects {
} }
components { components {
withType(NativeComponentSpec) { withType(NativeComponentSpec) {
//targetPlatform "linux32" targetPlatform "linux32"
targetPlatform "linux64" targetPlatform "linux64"
targetPlatform "macos" targetPlatform "macos"

1
settings.gradle
View File

@ -14,7 +14,6 @@ if (os.windows) {
include ':NetSSL_Win' include ':NetSSL_Win'
} }
include ':Data' include ':Data'
// SQL not ready yet
include ':Data:ODBC' include ':Data:ODBC'
include ':Data:SQLite' include ':Data:SQLite'
include ':Data:MySQL' include ':Data:MySQL'