Skip to content

Commit 697ceea

Browse files
committed
Allow forcing TileDB to be build on assemble
There are cases were the user will want to force building TileDB from source for the jar even if it is on their system.
1 parent 7255eca commit 697ceea

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
4646
set(CMAKE_CXX_EXTENSIONS OFF) # Don't use GNU extensions
4747

4848
option(TILEDB_VERBOSE "Prints TileDB errors with verbosity" OFF)
49-
option(TILEDB_S3 "Enables S3 support using aws-cpp-sdk" OFF)
49+
option(TILEDB_S3 "Enables S3 support using aws-cpp-sdk" ON)
5050
option(TILEDB_HDFS "Enables HDFS support using the official Hadoop JNI bindings" OFF)
51-
option(TILEDB_SERIALIZATION "Enables TileDB Cloud support" OFF)
51+
option(TILEDB_SERIALIZATION "Enables TileDB Cloud support" ON)
52+
option(TILEDB_AZURE "Enables Azure support in TileDB" OFF)
53+
option(TILEDB_GIT_REPOSITORY "Git repository to use for building" "")
54+
option(TILEDB_GIT_TAG "Git tag to use for building" "")
55+
option(FORCE_BUILD_TILEDB "Force building TileDB and don't check for system installation" OFF)
5256

5357
############################################################
5458
# Superbuild setup

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ task cmakeTask(type: Exec) {
6969
"TILEDB_S3",
7070
"TILEDB_AZURE",
7171
"TILEDB_HDFS",
72-
"TILEDB_SERIALIZATION"
72+
"TILEDB_SERIALIZATION",
73+
"FORCE_BUILD_TILEDB"
7374
].each { v ->
7475
if (project.hasProperty(v)) {
7576
buildArgs << "-D${v}=${project.property(v)}"

cmake/Modules/FindTileDB_EP.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ if (DEFINED ENV{TILEDB_HOME})
3232
list(APPEND CMAKE_PREFIX_PATH "$ENV{TILEDB_HOME}")
3333
endif()
3434

35-
find_package(TileDB CONFIG QUIET)
35+
if (FORCE_BUILD_TILEDB)
36+
find_package(TileDB CONFIG PATHS ${TILEDB_JNI_EP_INSTALL_PREFIX} NO_DEFAULT_PATH)
37+
else()
38+
find_package(TileDB CONFIG)
39+
endif()
3640

3741
if (NOT TILEDB_FOUND)
3842
if (TILEDB_JNI_SUPERBUILD)
@@ -50,7 +54,7 @@ if (NOT TILEDB_FOUND)
5054
-DTILEDB_S3=${TILEDB_S3}
5155
-DTILEDB_AZURE=${TILEDB_AZURE}
5256
-DTILEDB_HDFS=${TILEDB_HDFS}
53-
-DTILEDB_SERIALIZATION=${TILEDB_SERIALIZATION}
57+
-DTILEDB_SERIALIZATION=${TILEDB_SERIALIZATION}
5458
-DTILEDB_FORCE_ALL_DEPS=ON
5559
UPDATE_COMMAND ""
5660
INSTALL_COMMAND

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ TILEDB_S3=ON
55
TILEDB_AZURE=OFF
66
TILEDB_HDFS=OFF
77
TILEDB_SERIALIZATION=OFF
8+
FORCE_BUILD_TILEDB=OFF

0 commit comments

Comments
 (0)