Skip to content

Commit 76ba501

Browse files
update to TileDB-2.17.1
1 parent 4fe3557 commit 76ba501

File tree

4 files changed

+28
-9
lines changed

4 files changed

+28
-9
lines changed

CMakeLists.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,25 @@ target_link_libraries(tiledbjni
108108
${JAVA_JVM_LIBRARY}
109109
)
110110

111+
if (WIN32)
112+
get_target_property(LIBMAGIC_LIB libmagic IMPORTED_LOCATION)
113+
get_filename_component(LIBMAGIC_LIB_PATH ${LIBMAGIC_LIB} DIRECTORY)
114+
find_library(PCRE2_POSIX pcre2-posix REQUIRED PATHS ${LIBMAGIC_LIB_PATH})
115+
find_library(PCRE2_8 pcre2-8 REQUIRED PATHS ${LIBMAGIC_LIB_PATH})
116+
target_link_libraries(tiledbjni
117+
PRIVATE
118+
${PCRE2_POSIX}
119+
${PCRE2_8}
120+
WebServices
121+
Winhttp
122+
Wininet
123+
Userenv
124+
Version
125+
Secur32
126+
Ncrypt
127+
)
128+
endif()
129+
111130
if (TARGET TileDB::tiledb_static)
112131
target_link_libraries(tiledbjni
113132
PRIVATE

cmake/Modules/FindTileDB_EP.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ if (NOT TILEDB_FOUND)
4848
# Try to download prebuilt artifacts unless the user specifies to build from source
4949
if(DOWNLOAD_TILEDB_PREBUILT)
5050
if (WIN32) # Windows
51-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.0/tiledb-windows-x86_64-2.17.0-93c173d.zip")
52-
SET(DOWNLOAD_SHA1 "d43589b22de95d45b40de9918d105a6174ec352e")
51+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.1/tiledb-windows-x86_64-2.17.1-7c8c73b.zip")
52+
SET(DOWNLOAD_SHA1 "c3757a9205299a4184bd4de7621ff9f5118f14ca")
5353
elseif(APPLE) # macOS
54-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.0/tiledb-macos-x86_64-2.17.0-93c173d.tar.gz")
55-
SET(DOWNLOAD_SHA1 "9a232015cbf09c5bd37375537cef80a382e1ffa4")
54+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.1/tiledb-macos-x86_64-2.17.1-7c8c73b.tar.gz")
55+
SET(DOWNLOAD_SHA1 "998c099297c0441af40729634642bd358c962da6")
5656
else() # Linux
57-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.0/tiledb-linux-x86_64-2.17.0-93c173d.tar.gz")
58-
SET(DOWNLOAD_SHA1 "5c04c07a73d3fe48a9ba8f3ad8af5e1912a39ce8")
57+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.1/tiledb-linux-x86_64-2.17.1-7c8c73b.tar.gz")
58+
SET(DOWNLOAD_SHA1 "c01bf6898ef5bd108d49b378aa30aadfc3131b75")
5959
endif()
6060

6161
ExternalProject_Add(ep_tiledb

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB
2-
TILEDB_GIT_TAG=2.17.0
2+
TILEDB_GIT_TAG=2.17.1
33
TILEDB_VERBOSE=ON
44
TILEDB_S3=ON
55
TILEDB_AZURE=OFF
66
TILEDB_HDFS=OFF
77
TILEDB_SERIALIZATION=OFF
8-
FORCE_BUILD_TILEDB=ON
8+
FORCE_BUILD_TILEDB=OFF
99
DOWNLOAD_TILEDB_PREBUILT=ON
1010
TILEDB_SKIP_S3AWSSDK_DIR_LENGTH_CHECK=ON

src/test/java/io/tiledb/java/api/VersionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ public void testVersion() {
3535
System.out.println(version);
3636
Assert.assertTrue(version.getMajor() == 2);
3737
Assert.assertTrue(version.getMinor() == 17);
38-
Assert.assertTrue(version.getRevision() == 0);
38+
Assert.assertTrue(version.getRevision() == 1);
3939
}
4040
}

0 commit comments

Comments
 (0)