Update Gradle build

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

View File

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

View File

@@ -28,7 +28,7 @@ model {
srcDir 'src'
}
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', library: 'Data', linkage: 'shared'
lib project: ':Util', library: 'Util'

View File

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

View File

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

View File

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