@@ -156,7 +156,8 @@ ExternalProject_Add (orc-format_ep
156
156
# Snappy
157
157
if (ORC_PACKAGE_KIND STREQUAL "conan" )
158
158
find_package (Snappy REQUIRED CONFIG)
159
- orc_add_resolved_library (orc_snappy ${Snappy_LIBRARIES} ${Snappy_INCLUDE_DIR} )
159
+ add_library (orc_snappy INTERFACE )
160
+ target_link_libraries (orc_snappy INTERFACE Snappy::snappy)
160
161
list (APPEND ORC_SYSTEM_DEPENDENCIES Snappy)
161
162
list (APPEND ORC_INSTALL_INTERFACE_TARGETS "$<INSTALL_INTERFACE:Snappy::snappy>" )
162
163
elseif (ORC_PACKAGE_KIND STREQUAL "vcpkg" )
@@ -207,7 +208,8 @@ add_library (orc::snappy ALIAS orc_snappy)
207
208
208
209
if (ORC_PACKAGE_KIND STREQUAL "conan" )
209
210
find_package (ZLIB REQUIRED CONFIG)
210
- orc_add_resolved_library (orc_zlib ${ZLIB_LIBRARIES} ${ZLIB_INCLUDE_DIR} )
211
+ add_library (orc_zlib INTERFACE )
212
+ target_link_libraries (orc_zlib INTERFACE ZLIB::ZLIB)
211
213
list (APPEND ORC_SYSTEM_DEPENDENCIES ZLIB)
212
214
list (APPEND ORC_INSTALL_INTERFACE_TARGETS "$<INSTALL_INTERFACE:ZLIB::ZLIB>" )
213
215
elseif (ORC_PACKAGE_KIND STREQUAL "vcpkg" )
@@ -265,7 +267,11 @@ add_library (orc::zlib ALIAS orc_zlib)
265
267
266
268
if (ORC_PACKAGE_KIND STREQUAL "conan" )
267
269
find_package (ZSTD REQUIRED CONFIG)
268
- orc_add_resolved_library (orc_zstd ${zstd_LIBRARIES} ${zstd_INCLUDE_DIR} )
270
+ add_library (orc_zstd INTERFACE )
271
+ target_link_libraries (orc_zstd INTERFACE
272
+ $<TARGET_NAME_IF_EXISTS:zstd::libzstd_static>
273
+ $<TARGET_NAME_IF_EXISTS:zstd::libzstd_shared>
274
+ )
269
275
list (APPEND ORC_SYSTEM_DEPENDENCIES ZSTD)
270
276
list (APPEND ORC_INSTALL_INTERFACE_TARGETS "$<INSTALL_INTERFACE:$<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>>" )
271
277
elseif (ORC_PACKAGE_KIND STREQUAL "vcpkg" )
@@ -330,9 +336,13 @@ add_library (orc::zstd ALIAS orc_zstd)
330
336
# LZ4
331
337
if (ORC_PACKAGE_KIND STREQUAL "conan" )
332
338
find_package (LZ4 REQUIRED CONFIG)
333
- orc_add_resolved_library (orc_lz4 ${lz4_LIBRARIES} ${lz4_INCLUDE_DIR} )
339
+ add_library (orc_lz4 INTERFACE )
340
+ target_link_libraries (orc_lz4 INTERFACE
341
+ $<TARGET_NAME_IF_EXISTS:LZ4::lz4_shared>
342
+ $<TARGET_NAME_IF_EXISTS:LZ4::lz4_static>
343
+ )
334
344
list (APPEND ORC_SYSTEM_DEPENDENCIES LZ4)
335
- list (APPEND ORC_INSTALL_INTERFACE_TARGETS "$<INSTALL_INTERFACE:LZ4::lz4 >" )
345
+ list (APPEND ORC_INSTALL_INTERFACE_TARGETS "$<INSTALL_INTERFACE:$<IF:$<TARGET_EXISTS: LZ4::lz4_shared>,LZ4::lz4_shared,LZ4::lz4_static> >" )
336
346
elseif (ORC_PACKAGE_KIND STREQUAL "vcpkg" )
337
347
find_package (lz4 CONFIG REQUIRED)
338
348
add_library (orc_lz4 INTERFACE IMPORTED )
@@ -491,9 +501,10 @@ endif ()
491
501
492
502
if (ORC_PACKAGE_KIND STREQUAL "conan" )
493
503
find_package (Protobuf REQUIRED CONFIG)
494
- orc_add_resolved_library (orc_protobuf ${protobuf_LIBRARIES} ${protobuf_INCLUDE_DIR} )
504
+ add_library (orc_protobuf INTERFACE )
505
+ target_link_libraries (orc_protobuf INTERFACE protobuf::protobuf)
495
506
list (APPEND ORC_SYSTEM_DEPENDENCIES Protobuf)
496
- list (APPEND ORC_INSTALL_INTERFACE_TARGETS "$<INSTALL_INTERFACE:protobuf::libprotobuf >" )
507
+ list (APPEND ORC_INSTALL_INTERFACE_TARGETS "$<INSTALL_INTERFACE:protobuf::protobuf >" )
497
508
elseif (ORC_PACKAGE_KIND STREQUAL "vcpkg" )
498
509
find_package (Protobuf CONFIG REQUIRED)
499
510
add_library (orc_protobuf INTERFACE IMPORTED )
0 commit comments