Merge pull request #207 from TileDB-Inc/sethshelnutt/ch5899/add-option-to-force-building-tiledb

Allow forcing TileDB to be build on assemble

Author: Shelnutt2

CMakeLists.txt

@@ -46,9 +46,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 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_S3 "Enables S3 support using aws-cpp-sdk" ON)
 option(TILEDB_HDFS "Enables HDFS support using the official Hadoop JNI bindings" OFF)
-option(TILEDB_SERIALIZATION "Enables TileDB Cloud support" OFF)
+option(TILEDB_SERIALIZATION "Enables TileDB Cloud support" ON)
+option(TILEDB_AZURE "Enables Azure support in TileDB" OFF)
+option(TILEDB_GIT_REPOSITORY "Git repository to use for building" "")
+option(TILEDB_GIT_TAG "Git tag to use for building" "")
+option(FORCE_BUILD_TILEDB "Force building TileDB and don't check for system installation" OFF)
 
 ############################################################
 # Superbuild setup

build.gradle

@@ -69,7 +69,8 @@ task cmakeTask(type: Exec) {
         "TILEDB_S3",
         "TILEDB_AZURE",
         "TILEDB_HDFS",
-        "TILEDB_SERIALIZATION"
+        "TILEDB_SERIALIZATION",
+        "FORCE_BUILD_TILEDB"
     ].each { v ->
         if (project.hasProperty(v)) {
             buildArgs << "-D${v}=${project.property(v)}"

cmake/Modules/FindTileDB_EP.cmake

@@ -32,7 +32,11 @@ if (DEFINED ENV{TILEDB_HOME})
   list(APPEND CMAKE_PREFIX_PATH "$ENV{TILEDB_HOME}")
 endif()
 
-find_package(TileDB CONFIG QUIET)
+if (FORCE_BUILD_TILEDB)
+  find_package(TileDB CONFIG PATHS ${TILEDB_JNI_EP_INSTALL_PREFIX} NO_DEFAULT_PATH)
+else()
+  find_package(TileDB CONFIG)
+endif()
 
 if (NOT TILEDB_FOUND)
   if (TILEDB_JNI_SUPERBUILD)
@@ -50,7 +54,7 @@ if (NOT TILEDB_FOUND)
         -DTILEDB_S3=${TILEDB_S3}
         -DTILEDB_AZURE=${TILEDB_AZURE}
         -DTILEDB_HDFS=${TILEDB_HDFS}
-	-DTILEDB_SERIALIZATION=${TILEDB_SERIALIZATION}
+        -DTILEDB_SERIALIZATION=${TILEDB_SERIALIZATION}
         -DTILEDB_FORCE_ALL_DEPS=ON
       UPDATE_COMMAND ""
       INSTALL_COMMAND

gradle.properties

@@ -5,3 +5,4 @@ TILEDB_S3=ON
 TILEDB_AZURE=OFF
 TILEDB_HDFS=OFF
 TILEDB_SERIALIZATION=OFF
+FORCE_BUILD_TILEDB=OFF