Merge commit 'caab155a00ca0158dcb16844bea5326e2a2c2562' into dn

This commit is contained in:
Nik Bougalis
2015-08-18 08:47:41 -07:00
386 changed files with 26285 additions and 19140 deletions

View File

@@ -7,6 +7,7 @@
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
cmake \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DSOCI_TESTS=ON \
-DSOCI_STATIC=OFF \
-DSOCI_DB2=ON \
@@ -18,7 +19,7 @@ cmake \
-DSOCI_POSTGRESQL=OFF \
-DSOCI_SQLITE3=OFF \
-DSOCI_DB2_TEST_CONNSTR:STRING="DSN=SOCITEST\;Uid=db2inst1\;Pwd=db2inst1" \
..
..
run_make
run_test