mirror of
https://github.com/pocoproject/poco.git
synced 2025-04-16 23:12:57 +02:00
Update gradle
This commit is contained in:
parent
d6d27036d2
commit
9f1c03da4d
@ -4,47 +4,44 @@ model {
|
|||||||
mysql {
|
mysql {
|
||||||
binaries.withType(StaticLibraryBinary) {
|
binaries.withType(StaticLibraryBinary) {
|
||||||
def libName = "foobar"
|
def libName = "foobar"
|
||||||
println "StaticLibraryBinary:targetPlatform.name=" + targetPlatform.name
|
|
||||||
if (buildType == buildTypes.debug) {
|
if (buildType == buildTypes.debug) {
|
||||||
libName = 'libmysqld.lib'
|
libName = 'libmysqld.lib'
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
headers.srcDir "$mysql32Home/include"
|
headers.srcDir "$mysql32Home/include"
|
||||||
staticLibraryFile = file("$mysql32Home/lib/$libName")
|
staticLibraryFile = new File("$mysql32Home/lib/$libName")
|
||||||
} else
|
} else
|
||||||
if (targetPlatform.name == 'win64') {
|
if (targetPlatform.name == 'win64') {
|
||||||
headers.srcDir "$mysql64Home/include"
|
headers.srcDir "$mysql64Home/include"
|
||||||
staticLibraryFile = file("$mysql64Home/lib/$libName")
|
staticLibraryFile = new File("$mysql64Home/lib/$libName")
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
if (buildType == buildTypes.release) {
|
if (buildType == buildTypes.release) {
|
||||||
libName = 'libmysql.lib'
|
libName = 'libmysql.lib'
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
headers.srcDir "$mysql32Home/include"
|
headers.srcDir "$mysql32Home/include"
|
||||||
staticLibraryFile = file("$mysql32Home/lib/$libName")
|
staticLibraryFile = new File("$mysql32Home/lib/$libName")
|
||||||
} else
|
} else
|
||||||
if (targetPlatform.name == 'win64') {
|
if (targetPlatform.name == 'win64') {
|
||||||
headers.srcDir "$mysql64Home/include"
|
headers.srcDir "$mysql64Home/include"
|
||||||
staticLibraryFile = file("$mysql64Home/lib/$libName")
|
staticLibraryFile = new File("$mysql64Home/lib/$libName")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
binaries.withType(SharedLibraryBinary) {
|
binaries.withType(SharedLibraryBinary) {
|
||||||
def dllName
|
def dllName
|
||||||
def linkName
|
def linkName
|
||||||
println "SharedLibraryBinary:targetPlatform.name=" + targetPlatform.name
|
|
||||||
println ""
|
|
||||||
if (buildType == buildTypes.debug) {
|
if (buildType == buildTypes.debug) {
|
||||||
dllName = 'libmysqld.dll'
|
dllName = 'libmysqld.dll'
|
||||||
linkName = 'libmysqld.lib'
|
linkName = 'libmysqld.lib'
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
headers.srcDir "$mysql32Home/include"
|
headers.srcDir "$mysql32Home/include"
|
||||||
sharedLibraryFile = file("$mysql32Home/lib/$dllName")
|
sharedLibraryFile = new File("$mysql32Home/lib/$dllName")
|
||||||
sharedLibraryLinkFile = file("$mysql32Home/lib/$linkName")
|
sharedLibraryLinkFile = new File("$mysql32Home/lib/$linkName")
|
||||||
} else
|
} else
|
||||||
if (targetPlatform.name == 'win64') {
|
if (targetPlatform.name == 'win64') {
|
||||||
headers.srcDir "$mysql64Home/include"
|
headers.srcDir "$mysql64Home/include"
|
||||||
sharedLibraryFile = file("$mysql64Home/lib/$dllName")
|
sharedLibraryFile = new File("$mysql64Home/lib/$dllName")
|
||||||
sharedLibraryLinkFile = file("$mysql64Home/lib/$linkName")
|
sharedLibraryLinkFile = new File("$mysql64Home/lib/$linkName")
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
if (buildType == buildTypes.release) {
|
if (buildType == buildTypes.release) {
|
||||||
@ -52,13 +49,13 @@ model {
|
|||||||
linkName = 'libmysql.lib'
|
linkName = 'libmysql.lib'
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
headers.srcDir "$mysql32Home/include"
|
headers.srcDir "$mysql32Home/include"
|
||||||
sharedLibraryFile = file("$mysql32Home/lib/$dllName")
|
sharedLibraryFile = new File("$mysql32Home/lib/$dllName")
|
||||||
sharedLibraryLinkFile = file("$mysql32Home/lib/$linkName")
|
sharedLibraryLinkFile = new File("$mysql32Home/lib/$linkName")
|
||||||
} else
|
} else
|
||||||
if (targetPlatform.name == 'win64') {
|
if (targetPlatform.name == 'win64') {
|
||||||
headers.srcDir "$mysql64Home/include"
|
headers.srcDir "$mysql64Home/include"
|
||||||
sharedLibraryFile = file("$mysql64Home/lib/$dllName")
|
sharedLibraryFile = new File("$mysql64Home/lib/$dllName")
|
||||||
sharedLibraryLinkFile = file("$mysql64Home/lib/$linkName")
|
sharedLibraryLinkFile = new File("$mysql64Home/lib/$linkName")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -54,6 +54,23 @@ model {
|
|||||||
cppCompiler.define "SQLITE_OMIT_TCL_VARIABLE"
|
cppCompiler.define "SQLITE_OMIT_TCL_VARIABLE"
|
||||||
cppCompiler.define "SQLITE_OMIT_DEPRECATED"
|
cppCompiler.define "SQLITE_OMIT_DEPRECATED"
|
||||||
}
|
}
|
||||||
|
if (toolchain in Gcc) {
|
||||||
|
cCompiler.define "SQLITE_THREADSAFE=1"
|
||||||
|
cCompiler.define "SQLITE_DISABLE_LFS"
|
||||||
|
cCompiler.define "SQLITE_OMIT_UTF16"
|
||||||
|
cCompiler.define "SQLITE_OMIT_PROGRESS_CALLBACK"
|
||||||
|
cCompiler.define "SQLITE_OMIT_COMPLETE"
|
||||||
|
cCompiler.define "SQLITE_OMIT_TCL_VARIABLE"
|
||||||
|
cCompiler.define "SQLITE_OMIT_DEPRECATED"
|
||||||
|
|
||||||
|
cppCompiler.define "SQLITE_THREADSAFE=1"
|
||||||
|
cCompiler.define "SQLITE_DISABLE_LFS"
|
||||||
|
cppCompiler.define "SQLITE_OMIT_UTF16"
|
||||||
|
cppCompiler.define "SQLITE_OMIT_PROGRESS_CALLBACK"
|
||||||
|
cppCompiler.define "SQLITE_OMIT_COMPLETE"
|
||||||
|
cppCompiler.define "SQLITE_OMIT_TCL_VARIABLE"
|
||||||
|
cppCompiler.define "SQLITE_OMIT_DEPRECATED"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
withType(SharedLibraryBinarySpec) {
|
withType(SharedLibraryBinarySpec) {
|
||||||
if (toolChain in VisualCpp) {
|
if (toolChain in VisualCpp) {
|
||||||
|
@ -43,19 +43,19 @@ OpenCppCoverageHome=C:/Program Files/OpenCppCoverage
|
|||||||
#ReportGeneratorHome=C:/ProgramFiles/ReportGenerator
|
#ReportGeneratorHome=C:/ProgramFiles/ReportGenerator
|
||||||
ReportGeneratorHome=C:/ProgramFiles/ReportGenerator
|
ReportGeneratorHome=C:/ProgramFiles/ReportGenerator
|
||||||
|
|
||||||
openSSLWindowsHome = new File(rootDir, "openssl/build")
|
openSSLWindowsHome = "openssl/build"
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Linux Customization
|
# Linux Customization
|
||||||
###############################################################################
|
###############################################################################
|
||||||
openSSLLinuxLib = new File('/usr/local/lib')
|
openSSLLinuxLib = "/usr/local/lib"
|
||||||
openSSLLinuxInc = new File('/usr/local/include/openssl')
|
openSSLLinuxInc = "/usr/local/include/openssl"
|
||||||
|
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Mac OSX Customization
|
# Mac OSX Customization
|
||||||
###############################################################################
|
###############################################################################
|
||||||
openSSLBrewHome = new File('/usr/local/opt/openssl')
|
openSSLBrewHome = "/usr/local/opt/openssl"
|
||||||
|
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
@ -15,7 +15,7 @@ if (os.windows) {
|
|||||||
}
|
}
|
||||||
include ':Data'
|
include ':Data'
|
||||||
// SQL not ready yet
|
// SQL not ready yet
|
||||||
//include ':Data:ODBC'
|
include ':Data:ODBC'
|
||||||
//include ':Data:SQLite'
|
//include ':Data:SQLite'
|
||||||
//include ':Data:MySQL'
|
//include ':Data:MySQL'
|
||||||
include ':Zip'
|
include ':Zip'
|
||||||
@ -39,10 +39,11 @@ include ':Net:testsuite'
|
|||||||
if (os.windows) {
|
if (os.windows) {
|
||||||
include ':NetSSL_Win:testsuite'
|
include ':NetSSL_Win:testsuite'
|
||||||
}
|
}
|
||||||
//include ':Data:testsuite'
|
include ':Data:testsuite'
|
||||||
//include ':Data:ODBC:testsuite'
|
include ':Data:ODBC:testsuite'
|
||||||
//include ':Data:SQLite:testsuite'
|
include ':Data:SQLite:testsuite'
|
||||||
//include ':Data:MySQL:testsuite'
|
//include ':Data:MySQL:testsuite'
|
||||||
|
//include ':Data:SQLite:testsuite'
|
||||||
include ':MongoDB:testsuite'
|
include ':MongoDB:testsuite'
|
||||||
include ':Redis:testsuite'
|
include ':Redis:testsuite'
|
||||||
include ':CppParser:testsuite'
|
include ':CppParser:testsuite'
|
||||||
@ -50,7 +51,7 @@ include ':Zip:testsuite'
|
|||||||
|
|
||||||
include ':Encodings:samples'
|
include ':Encodings:samples'
|
||||||
include ':Foundation:samples'
|
include ':Foundation:samples'
|
||||||
//include ':Data:samples'
|
include ':Data:samples'
|
||||||
//include ':NetSSL_OpenSSL:samples'
|
//include ':NetSSL_OpenSSL:samples'
|
||||||
if (os.windows) {
|
if (os.windows) {
|
||||||
include ':NetSSL_Win:samples'
|
include ':NetSSL_Win:samples'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user