Skip to content

Commit 28b106c

Browse files
Always link to tiledb dynamically. (#314)
* Always link to tiledb dynamically. * test release CI with dynamic linking * Revert "test release CI with dynamic linking"
1 parent 2e9cac7 commit 28b106c

File tree

1 file changed

+4
-30
lines changed

1 file changed

+4
-30
lines changed

CMakeLists.txt

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -116,36 +116,10 @@ target_link_libraries(tiledbjni
116116
${JAVA_JVM_LIBRARY}
117117
)
118118

119-
if (WIN32)
120-
get_target_property(LIBMAGIC_LIB libmagic IMPORTED_LOCATION)
121-
get_filename_component(LIBMAGIC_LIB_PATH ${LIBMAGIC_LIB} DIRECTORY)
122-
find_library(PCRE2_POSIX pcre2-posix REQUIRED PATHS ${LIBMAGIC_LIB_PATH})
123-
find_library(PCRE2_8 pcre2-8 REQUIRED PATHS ${LIBMAGIC_LIB_PATH})
124-
target_link_libraries(tiledbjni
125-
PRIVATE
126-
${PCRE2_POSIX}
127-
${PCRE2_8}
128-
WebServices
129-
Winhttp
130-
Wininet
131-
Userenv
132-
Version
133-
Secur32
134-
Ncrypt
135-
)
136-
endif()
137-
138-
if (TARGET TileDB::tiledb_static)
139-
target_link_libraries(tiledbjni
140-
PRIVATE
141-
TileDB::tiledb_static
142-
)
143-
else()
144-
target_link_libraries(tiledbjni
145-
PRIVATE
146-
TileDB::tiledb_shared
147-
)
148-
endif()
119+
target_link_libraries(tiledbjni
120+
PRIVATE
121+
TileDB::tiledb_shared
122+
)
149123

150124
# Set rpath to be relative to the .so.
151125
if (APPLE)

0 commit comments

Comments
 (0)