generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-12 18:20:26 +01:00
Code Issues Projects Releases Wiki Activity

Update for Data/PostgreSQL

Browse Source
This commit is contained in:
zosrothko 2018-05-12 14:55:01 +02:00
parent e9db9bddb1
commit 36fbbb7a6d
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Data/PostgreSQL/build.gradle
View File

@ -19,7 +19,7 @@ model {
} else } else
if (targetPlatform.operatingSystem.linux) { if (targetPlatform.operatingSystem.linux) {
libName = 'libintl.lib' libName = 'libintl.lib'
headers.srcDir(new File("$postgres64LinuxInc/include")) headers.srcDir(new File("$postgres64LinuxInc"))
staticLibraryFile = new File("$postgres64LinuxLib/$libName") staticLibraryFile = new File("$postgres64LinuxLib/$libName")
} }
} else } else
@ -38,7 +38,7 @@ model {
} else } else
if (targetPlatform.operatingSystem.linux) { if (targetPlatform.operatingSystem.linux) {
libName = 'libintl.lib' libName = 'libintl.lib'
headers.srcDir(new File("$postgres64LinuxInc/include")) headers.srcDir(new File("$postgres64LinuxInc"))
staticLibraryFile = new File("$postgres64LinuxLib/$libName") staticLibraryFile = new File("$postgres64LinuxLib/$libName")
} }
} }
@ -66,7 +66,7 @@ model {
if (targetPlatform.operatingSystem.linux) { if (targetPlatform.operatingSystem.linux) {
dllName = 'libintl-8.so' dllName = 'libintl-8.so'
linkName = 'libintl.a' linkName = 'libintl.a'
headers.srcDir(new File("$postgres64LinuxInc/include")) headers.srcDir(new File("$postgres64LinuxInc"))
sharedLibraryFile = new File("$postgres64LinuxLib/bin/$dllName") sharedLibraryFile = new File("$postgres64LinuxLib/bin/$dllName")
sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName") sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName")
} }
@ -91,7 +91,7 @@ model {
if (targetPlatform.operatingSystem.linux) { if (targetPlatform.operatingSystem.linux) {
dllName = 'libintl-8.so' dllName = 'libintl-8.so'
linkName = 'libintl.a' linkName = 'libintl.a'
headers.srcDir(new File("$postgres64LinuxInc/include")) headers.srcDir(new File("$postgres64LinuxInc"))
sharedLibraryFile = new File("$postgres64LinuxLib/bin/$dllName") sharedLibraryFile = new File("$postgres64LinuxLib/bin/$dllName")
sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName") sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName")
} }
@ -116,7 +116,7 @@ model {
} else } else
if (targetPlatform.operatingSystem.linux) { if (targetPlatform.operatingSystem.linux) {
libName = 'iconv.a' libName = 'iconv.a'
headers.srcDir(new File("$postgres64LinuxInc/include")) headers.srcDir(new File("$postgres64LinuxInc"))
staticLibraryFile = new File("$postgres64LinuxLib/$libName") staticLibraryFile = new File("$postgres64LinuxLib/$libName")
} }
} else } else
@ -135,7 +135,7 @@ model {
} else } else
if (targetPlatform.operatingSystem.linux) { if (targetPlatform.operatingSystem.linux) {
libName = 'iconv.a' libName = 'iconv.a'
headers.srcDir(new File("$postgres64LinuxInc/include")) headers.srcDir(new File("$postgres64LinuxInc"))
staticLibraryFile = new File("$postgres64LinuxLib/$libName") staticLibraryFile = new File("$postgres64LinuxLib/$libName")
} }
} }
@ -163,7 +163,7 @@ model {
if (targetPlatform.operatingSystem.linux) { if (targetPlatform.operatingSystem.linux) {
dllName = 'libiconv-2.so' dllName = 'libiconv-2.so'
linkName = 'iconv.a' linkName = 'iconv.a'
headers.srcDir(new File("$postgres64LinuxInc/include")) headers.srcDir(new File("$postgres64LinuxInc"))
sharedLibraryFile = new File("$postgres64LinuxLib/bin/$dllName") sharedLibraryFile = new File("$postgres64LinuxLib/bin/$dllName")
sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName") sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName")
} }
@ -188,7 +188,7 @@ model {
if (targetPlatform.operatingSystem.linux) { if (targetPlatform.operatingSystem.linux) {
dllName = 'libiconv-2.so' dllName = 'libiconv-2.so'
linkName = 'iconv.a' linkName = 'iconv.a'
headers.srcDir(new File("$postgres64LinuxInc/include")) headers.srcDir(new File("$postgres64LinuxInc"))
sharedLibraryFile = new File("$postgres64LinuxLib/bin/$dllName") sharedLibraryFile = new File("$postgres64LinuxLib/bin/$dllName")
sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName") sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName")
} }
@ -213,7 +213,7 @@ model {
} else } else
if (targetPlatform.operatingSystem.linux) { if (targetPlatform.operatingSystem.linux) {
libName = 'libpq.a' libName = 'libpq.a'
headers.srcDir(new File("$postgres64LinuxInc/include") ) headers.srcDir(new File("$postgres64LinuxInc") )
staticLibraryFile = new File("$postgres32LinuxLib/$libName") staticLibraryFile = new File("$postgres32LinuxLib/$libName")
} }
} else } else
@ -232,7 +232,7 @@ model {
} else } else
if (targetPlatform.operatingSystem.linux) { if (targetPlatform.operatingSystem.linux) {
libName = 'libpq.a' libName = 'libpq.a'
headers.srcDir(new File("$postgres64LinuxInc/include")) headers.srcDir(new File("$postgres64LinuxInc"))
staticLibraryFile = new File("$postgres32LinuxLib/$libName") staticLibraryFile = new File("$postgres32LinuxLib/$libName")
} }
} }
@ -260,7 +260,7 @@ model {
if (targetPlatform.operatingSystem.linux) { if (targetPlatform.operatingSystem.linux) {
dllName = 'libpq.so' dllName = 'libpq.so'
linkName = 'libpq.a' linkName = 'libpq.a'
headers.srcDir( new File("$postgres64LinuxInc/include") ) headers.srcDir( new File("$postgres64LinuxInc") )
sharedLibraryFile = new File("$postgres64LinuxLib/$dllName") sharedLibraryFile = new File("$postgres64LinuxLib/$dllName")
sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName") sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName")
} }
@ -285,7 +285,7 @@ model {
if (targetPlatform.operatingSystem.linux) { if (targetPlatform.operatingSystem.linux) {
dllName = 'libpq.so' dllName = 'libpq.so'
linkName = 'libpq.a' linkName = 'libpq.a'
headers.srcDir(new File("$postgres64LinuxInc/include")) headers.srcDir(new File("$postgres64LinuxInc"))
sharedLibraryFile = new File("$postgres64LinuxLib/$dllName") sharedLibraryFile = new File("$postgres64LinuxLib/$dllName")
sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName") sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName")
} }

9
Data/PostgreSQL/testsuite/build.gradle
View File

@ -27,13 +27,15 @@ model {
exportedHeaders { exportedHeaders {
srcDir 'src' srcDir 'src'
} }
lib project: ':CppUnit', library: 'CppUnit'
lib project: ':Data:PostgreSQL', library: 'DataPostgreSQL'
lib project: ':Data:PostgreSQL', library: 'postgres' lib project: ':Data:PostgreSQL', library: 'postgres'
lib project: ':Data:PostgreSQL', library: 'DataPostgreSQL'
lib project: ':Data:PostgreSQL', library: 'intl' lib project: ':Data:PostgreSQL', library: 'intl'
lib project: ':Data:PostgreSQL', library: 'iconv' lib project: ':Data:PostgreSQL', library: 'iconv'
lib project: ':Data', library: 'Data' lib project: ':Data', library: 'Data'
lib project: ':Foundation', library: 'Foundation' lib project: ':Foundation', library: 'Foundation'
lib project: ':CppUnit', library: 'CppUnit'
lib library: 'ssl'
lib library: 'crypto'
} }
} }
} }
@ -59,6 +61,9 @@ model {
} }
} }
if (toolChain in Gcc) { if (toolChain in Gcc) {
linker.args ( "-l", "z")
linker.args ( "-l", "pthread")
linker.args ( "-l", "dl")
} }
} }
} }

2
settings.gradle
View File

@ -43,7 +43,7 @@ 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:PostgreSQL:testsuite' //include ':Data:PostgreSQL:testsuite' // needs OpenSSL setup
include ':MongoDB:testsuite' include ':MongoDB:testsuite'
include ':Redis:testsuite' include ':Redis:testsuite'
include ':CppParser:testsuite' include ':CppParser:testsuite'