generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-07 19:44:45 +02:00
Code Issues Projects Releases Wiki Activity

Update Gradle build

Browse Source
This commit is contained in:
Francis ANDRE
2018-05-03 18:04:59 +02:00
parent 215bd88183
commit cb3c31b4c6
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/MySQL/build.gradle
View File

@@ -73,7 +73,7 @@ model {
exportedHeaders { exportedHeaders {
srcDir 'include' srcDir 'include'
} }
// lib library: 'mysql' lib library: 'mysql'
lib project: ':Data', library: 'Data' lib project: ':Data', library: 'Data'
lib project: ':Foundation', library: 'Foundation' lib project: ':Foundation', library: 'Foundation'
} }

2
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'

6
Data/samples/build.gradle
View File

@@ -4,6 +4,7 @@ model {
sources { sources {
cpp.source { srcDir 'Binding/src' include '**/*.cpp' } cpp.source { srcDir 'Binding/src' include '**/*.cpp' }
cpp.lib project: ':Data', library: 'Data' cpp.lib project: ':Data', library: 'Data'
cpp.lib project: ':Data:SQLite', library: 'DataSQLite'
cpp.lib project: ':Foundation', library: 'Foundation' cpp.lib project: ':Foundation', library: 'Foundation'
} }
} }
@@ -11,6 +12,7 @@ model {
sources { sources {
cpp.source { srcDir 'RecordSet/src' include '**/*.cpp' } cpp.source { srcDir 'RecordSet/src' include '**/*.cpp' }
cpp.lib project: ':Data', library: 'Data' cpp.lib project: ':Data', library: 'Data'
cpp.lib project: ':Data:SQLite', library: 'DataSQLite'
cpp.lib project: ':Foundation', library: 'Foundation' cpp.lib project: ':Foundation', library: 'Foundation'
} }
} }
@@ -18,6 +20,7 @@ model {
sources { sources {
cpp.source { srcDir 'RowFormatter/src' include '**/*.cpp' } cpp.source { srcDir 'RowFormatter/src' include '**/*.cpp' }
cpp.lib project: ':Data', library: 'Data' cpp.lib project: ':Data', library: 'Data'
cpp.lib project: ':Data:SQLite', library: 'DataSQLite'
cpp.lib project: ':Foundation', library: 'Foundation' cpp.lib project: ':Foundation', library: 'Foundation'
} }
} }
@@ -25,6 +28,7 @@ model {
sources { sources {
cpp.source { srcDir 'Tuple/src' include '**/*.cpp' } cpp.source { srcDir 'Tuple/src' include '**/*.cpp' }
cpp.lib project: ':Data', library: 'Data' cpp.lib project: ':Data', library: 'Data'
cpp.lib project: ':Data:SQLite', library: 'DataSQLite'
cpp.lib project: ':Foundation', library: 'Foundation' cpp.lib project: ':Foundation', library: 'Foundation'
} }
} }
@@ -32,6 +36,7 @@ model {
sources { sources {
cpp.source { srcDir 'TypeHandler/src' include '**/*.cpp' } cpp.source { srcDir 'TypeHandler/src' include '**/*.cpp' }
cpp.lib project: ':Data', library: 'Data' cpp.lib project: ':Data', library: 'Data'
cpp.lib project: ':Data:SQLite', library: 'DataSQLite'
cpp.lib project: ':Foundation', library: 'Foundation' cpp.lib project: ':Foundation', library: 'Foundation'
} }
} }
@@ -39,6 +44,7 @@ model {
sources { sources {
cpp.source { srcDir 'WebNotifier/src' include '**/*.cpp' } cpp.source { srcDir 'WebNotifier/src' include '**/*.cpp' }
cpp.lib project: ':Data', library: 'Data' cpp.lib project: ':Data', library: 'Data'
cpp.lib project: ':Data:SQLite', library: 'DataSQLite'
cpp.lib project: ':Net', library: 'Net' cpp.lib project: ':Net', library: 'Net'
cpp.lib project: ':Foundation', library: 'Foundation' cpp.lib project: ':Foundation', library: 'Foundation'
} }

1
Foundation/build.gradle
View File

@@ -103,7 +103,6 @@ model {
} }
withType(SharedLibraryBinarySpec) { withType(SharedLibraryBinarySpec) {
if (toolChain in VisualCpp) { if (toolChain in VisualCpp) {
// addCompilerDefine "Foundation_EXPORTS" ""
cCompiler.define "Foundation_EXPORTS" cCompiler.define "Foundation_EXPORTS"
cppCompiler.define "Foundation_EXPORTS" cppCompiler.define "Foundation_EXPORTS"
} }

6
settings.gradle.win
View File

@@ -18,7 +18,7 @@ include ':Data'
if (os.windows) { if (os.windows) {
include ':Data:ODBC' include ':Data:ODBC'
include ':Data:SQLite' include ':Data:SQLite'
// include ':Data:MySQL' include ':Data:MySQL'
} }
include ':Zip' include ':Zip'
include ':PageCompiler' include ':PageCompiler'
@@ -45,9 +45,9 @@ include ':Data:testsuite'
if (os.windows) { if (os.windows) {
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 ':MongoDB:testsuite' include ':MongoDB:testsuite'
include ':Redis:testsuite' include ':Redis:testsuite'
include ':CppParser:testsuite' include ':CppParser:testsuite'
include ':Zip:testsuite' include ':Zip:testsuite'