Skip to content

Always link to tiledb dynamically. #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DimitrisStaratzis merged 3 commits into from
Oct 26, 2023
Merged

Always link to tiledb dynamically. #314

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f33b32
Always link to tiledb dynamically.
teo-tsirpanis Oct 25, 2023
f3446e1
test release CI with dynamic linking
DimitrisStaratzis Oct 25, 2023
421cf99
Revert "test release CI with dynamic linking"
DimitrisStaratzis Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 4 additions & 30 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,36 +116,10 @@ target_link_libraries(tiledbjni
${JAVA_JVM_LIBRARY}
)

if (WIN32)
get_target_property(LIBMAGIC_LIB libmagic IMPORTED_LOCATION)
get_filename_component(LIBMAGIC_LIB_PATH ${LIBMAGIC_LIB} DIRECTORY)
find_library(PCRE2_POSIX pcre2-posix REQUIRED PATHS ${LIBMAGIC_LIB_PATH})
find_library(PCRE2_8 pcre2-8 REQUIRED PATHS ${LIBMAGIC_LIB_PATH})
target_link_libraries(tiledbjni
PRIVATE
${PCRE2_POSIX}
${PCRE2_8}
WebServices
Winhttp
Wininet
Userenv
Version
Secur32
Ncrypt
)
endif()

if (TARGET TileDB::tiledb_static)
target_link_libraries(tiledbjni
PRIVATE
TileDB::tiledb_static
)
else()
target_link_libraries(tiledbjni
PRIVATE
TileDB::tiledb_shared
)
endif()
target_link_libraries(tiledbjni
PRIVATE
TileDB::tiledb_shared
)

# Set rpath to be relative to the .so.
if (APPLE)
Expand Down