From 36fbbb7a6db3cd668eff3c79600d61cf07990eed Mon Sep 17 00:00:00 2001 From: zosrothko Date: Sat, 12 May 2018 14:55:01 +0200 Subject: [PATCH] Update for Data/PostgreSQL --- Data/PostgreSQL/build.gradle | 24 ++++++++++++------------ Data/PostgreSQL/testsuite/build.gradle | 9 +++++++-- settings.gradle | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Data/PostgreSQL/build.gradle b/Data/PostgreSQL/build.gradle index ce959c3b5..e7cb463c8 100644 --- a/Data/PostgreSQL/build.gradle +++ b/Data/PostgreSQL/build.gradle @@ -19,7 +19,7 @@ model { } else if (targetPlatform.operatingSystem.linux) { libName = 'libintl.lib' - headers.srcDir(new File("$postgres64LinuxInc/include")) + headers.srcDir(new File("$postgres64LinuxInc")) staticLibraryFile = new File("$postgres64LinuxLib/$libName") } } else @@ -38,7 +38,7 @@ model { } else if (targetPlatform.operatingSystem.linux) { libName = 'libintl.lib' - headers.srcDir(new File("$postgres64LinuxInc/include")) + headers.srcDir(new File("$postgres64LinuxInc")) staticLibraryFile = new File("$postgres64LinuxLib/$libName") } } @@ -66,7 +66,7 @@ model { if (targetPlatform.operatingSystem.linux) { dllName = 'libintl-8.so' linkName = 'libintl.a' - headers.srcDir(new File("$postgres64LinuxInc/include")) + headers.srcDir(new File("$postgres64LinuxInc")) sharedLibraryFile = new File("$postgres64LinuxLib/bin/$dllName") sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName") } @@ -91,7 +91,7 @@ model { if (targetPlatform.operatingSystem.linux) { dllName = 'libintl-8.so' linkName = 'libintl.a' - headers.srcDir(new File("$postgres64LinuxInc/include")) + headers.srcDir(new File("$postgres64LinuxInc")) sharedLibraryFile = new File("$postgres64LinuxLib/bin/$dllName") sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName") } @@ -116,7 +116,7 @@ model { } else if (targetPlatform.operatingSystem.linux) { libName = 'iconv.a' - headers.srcDir(new File("$postgres64LinuxInc/include")) + headers.srcDir(new File("$postgres64LinuxInc")) staticLibraryFile = new File("$postgres64LinuxLib/$libName") } } else @@ -135,7 +135,7 @@ model { } else if (targetPlatform.operatingSystem.linux) { libName = 'iconv.a' - headers.srcDir(new File("$postgres64LinuxInc/include")) + headers.srcDir(new File("$postgres64LinuxInc")) staticLibraryFile = new File("$postgres64LinuxLib/$libName") } } @@ -163,7 +163,7 @@ model { if (targetPlatform.operatingSystem.linux) { dllName = 'libiconv-2.so' linkName = 'iconv.a' - headers.srcDir(new File("$postgres64LinuxInc/include")) + headers.srcDir(new File("$postgres64LinuxInc")) sharedLibraryFile = new File("$postgres64LinuxLib/bin/$dllName") sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName") } @@ -188,7 +188,7 @@ model { if (targetPlatform.operatingSystem.linux) { dllName = 'libiconv-2.so' linkName = 'iconv.a' - headers.srcDir(new File("$postgres64LinuxInc/include")) + headers.srcDir(new File("$postgres64LinuxInc")) sharedLibraryFile = new File("$postgres64LinuxLib/bin/$dllName") sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName") } @@ -213,7 +213,7 @@ model { } else if (targetPlatform.operatingSystem.linux) { libName = 'libpq.a' - headers.srcDir(new File("$postgres64LinuxInc/include") ) + headers.srcDir(new File("$postgres64LinuxInc") ) staticLibraryFile = new File("$postgres32LinuxLib/$libName") } } else @@ -232,7 +232,7 @@ model { } else if (targetPlatform.operatingSystem.linux) { libName = 'libpq.a' - headers.srcDir(new File("$postgres64LinuxInc/include")) + headers.srcDir(new File("$postgres64LinuxInc")) staticLibraryFile = new File("$postgres32LinuxLib/$libName") } } @@ -260,7 +260,7 @@ model { if (targetPlatform.operatingSystem.linux) { dllName = 'libpq.so' linkName = 'libpq.a' - headers.srcDir( new File("$postgres64LinuxInc/include") ) + headers.srcDir( new File("$postgres64LinuxInc") ) sharedLibraryFile = new File("$postgres64LinuxLib/$dllName") sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName") } @@ -285,7 +285,7 @@ model { if (targetPlatform.operatingSystem.linux) { dllName = 'libpq.so' linkName = 'libpq.a' - headers.srcDir(new File("$postgres64LinuxInc/include")) + headers.srcDir(new File("$postgres64LinuxInc")) sharedLibraryFile = new File("$postgres64LinuxLib/$dllName") sharedLibraryLinkFile = new File("$postgres64LinuxLib/$linkName") } diff --git a/Data/PostgreSQL/testsuite/build.gradle b/Data/PostgreSQL/testsuite/build.gradle index ccd1dc42a..d1ae5b80f 100644 --- a/Data/PostgreSQL/testsuite/build.gradle +++ b/Data/PostgreSQL/testsuite/build.gradle @@ -27,13 +27,15 @@ model { exportedHeaders { srcDir 'src' } - lib project: ':CppUnit', library: 'CppUnit' - lib project: ':Data:PostgreSQL', library: 'DataPostgreSQL' lib project: ':Data:PostgreSQL', library: 'postgres' + lib project: ':Data:PostgreSQL', library: 'DataPostgreSQL' lib project: ':Data:PostgreSQL', library: 'intl' lib project: ':Data:PostgreSQL', library: 'iconv' lib project: ':Data', library: 'Data' 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) { + linker.args ( "-l", "z") + linker.args ( "-l", "pthread") + linker.args ( "-l", "dl") } } } diff --git a/settings.gradle b/settings.gradle index 70375f84b..b96ca1aec 100644 --- a/settings.gradle +++ b/settings.gradle @@ -43,7 +43,7 @@ include ':Data:testsuite' include ':Data:ODBC:testsuite' include ':Data:SQLite:testsuite' //include ':Data:MySQL:testsuite' -include ':Data:PostgreSQL:testsuite' +//include ':Data:PostgreSQL:testsuite' // needs OpenSSL setup include ':MongoDB:testsuite' include ':Redis:testsuite' include ':CppParser:testsuite'