diff --git a/CMakeLists.txt b/CMakeLists.txt index d9105aa6..598984a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) # Don't use GNU extensions option(TILEDB_VERBOSE "Prints TileDB errors with verbosity" OFF) option(TILEDB_S3 "Enables S3 support using aws-cpp-sdk" OFF) option(TILEDB_HDFS "Enables HDFS support using the official Hadoop JNI bindings" OFF) +option(TILEDB_SERIALIZATION "Enables TileDB Cloud support" OFF) ############################################################ # Superbuild setup diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d99c6de4..1564f03c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,7 +21,8 @@ stages: matrix: VS2019: imageName: 'windows-2019' - TILEDB_S3: ON + ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: "OFF" + ORG_GRADLE_PROJECT_TILEDB_S3: "OFF" pool: vmImage: $(imageName) steps: @@ -39,8 +40,12 @@ stages: matrix: ubuntu_18: imageName: 'ubuntu-18.04' + ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: "OFF" + ORG_GRADLE_PROJECT_TILEDB_S3: "OFF" macOS: imageName: 'macOS-10.14' + ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: "OFF" + ORG_GRADLE_PROJECT_TILEDB_S3: "OFF" pool: vmImage: $(imageName) steps: @@ -54,8 +59,12 @@ stages: matrix: ubuntu_18: imageName: 'ubuntu-18.04' + ORG_GRADLE_PROJECT_TILEDB_S3: "ON" + ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: "ON" macOS: imageName: 'macOS-10.14' + ORG_GRADLE_PROJECT_TILEDB_S3: "ON" + ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: "ON" pool: vmImage: $(imageName) steps: @@ -65,6 +74,7 @@ stages: matrix: windows_19: imageName: 'windows-2019' + ORG_GRADLE_PROJECT_TILEDB_S3: "ON" pool: vmImage: $(imageName) steps: @@ -78,6 +88,8 @@ stages: matrix: ubuntu_18: imageName: 'ubuntu-18.04' + ORG_GRADLE_PROJECT_TILEDB_S3: "ON" + ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: "ON" pool: vmImage: $(imageName) @@ -141,4 +153,4 @@ stages: pool: vmImage: $(imageName) steps: - - template: ci/tiledb-java-final-jar.yml \ No newline at end of file + - template: ci/tiledb-java-final-jar.yml diff --git a/build.gradle b/build.gradle index a9bec91f..07447da6 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { } group 'io.tiledb' -version '0.3.1-SNAPSHOT' +version '0.3.2-SNAPSHOT' repositories { jcenter() diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index c2ede32f..0133ba19 100644 --- a/cmake/Modules/FindTileDB_EP.cmake +++ b/cmake/Modules/FindTileDB_EP.cmake @@ -49,6 +49,7 @@ if (NOT TILEDB_FOUND) -DTILEDB_VERBOSE=${TILEDB_VERBOSE} -DTILEDB_S3=${TILEDB_S3} -DTILEDB_HDFS=${TILEDB_HDFS} + -DTILEDB_SERIALIZATION=${TILEDB_SERIALIZATION} -DTILEDB_FORCE_ALL_DEPS=ON UPDATE_COMMAND "" INSTALL_COMMAND diff --git a/gradle.properties b/gradle.properties index 2f398a64..2252a550 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB TILEDB_GIT_TAG=2.0.3 TILEDB_VERBOSE=OFF -TILEDB_S3=OFF +TILEDB_S3=ON TILEDB_HDFS=OFF TILEDB_SERIALIZATION=OFF