Skip to content

Commit cf61256

Browse files
committed
fix FlatBuffers's shared lib target name
and refactor
1 parent 576b9c7 commit cf61256

1 file changed

Lines changed: 15 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -316,22 +316,29 @@ if (REFLECTCPP_CBOR OR REFLECTCPP_CHECK_HEADERS)
316316
include_directories(PUBLIC ${jsoncons_INCLUDE_DIRS})
317317
endif ()
318318

319+
set(arrow_lib Arrow::arrow_${linkage_type})
319320
if (REFLECTCPP_CSV OR REFLECTCPP_CHECK_HEADERS)
320-
if (NOT TARGET Arrow::arrow_${linkage_type})
321+
if (NOT TARGET "${arrow_lib}")
321322
find_package(Arrow CONFIG REQUIRED)
322323
endif()
323324

324-
target_link_libraries(reflectcpp PUBLIC Arrow::arrow_${linkage_type})
325+
target_link_libraries(reflectcpp PUBLIC "${arrow_lib}")
325326
endif ()
326327

327328
if (REFLECTCPP_FLEXBUFFERS OR REFLECTCPP_CHECK_HEADERS)
328329
list(APPEND REFLECT_CPP_SOURCES
329330
src/reflectcpp_flexbuf.cpp
330331
)
331-
if (NOT TARGET flatbuffers::flatbuffers)
332+
333+
set(flatbuf_lib flatbuffers::flatbuffers)
334+
if(REFLECTCPP_BUILD_SHARED)
335+
string(APPEND flatbuf_lib "_shared")
336+
endif()
337+
if (NOT TARGET "${flatbuf_lib}")
332338
find_package(flatbuffers CONFIG REQUIRED)
333339
endif ()
334-
target_link_libraries(reflectcpp PUBLIC flatbuffers::flatbuffers)
340+
341+
target_link_libraries(reflectcpp PUBLIC "${flatbuf_lib}")
335342
endif ()
336343

337344
if (REFLECTCPP_MSGPACK OR REFLECTCPP_CHECK_HEADERS)
@@ -348,18 +355,19 @@ if (REFLECTCPP_MSGPACK OR REFLECTCPP_CHECK_HEADERS)
348355
endif()
349356
endif ()
350357

358+
set(parquet_lib Parquet::parquet_${linkage_type})
351359
if (REFLECTCPP_PARQUET OR REFLECTCPP_CHECK_HEADERS)
352-
if (NOT TARGET Arrow::arrow_${linkage_type})
360+
if (NOT TARGET "${arrow_lib}")
353361
find_package(Arrow CONFIG REQUIRED)
354362
endif()
355363

356-
if (NOT TARGET Parquet::parquet_${linkage_type})
364+
if (NOT TARGET "${parquet_lib}")
357365
find_package(Parquet CONFIG REQUIRED
358366
NAMES Parquet Arrow # Conan merges the Parquet package into Arrow
359367
)
360368
endif()
361369

362-
target_link_libraries(reflectcpp PUBLIC Arrow::arrow_${linkage_type} Parquet::parquet_${linkage_type})
370+
target_link_libraries(reflectcpp PUBLIC "${arrow_lib}" "${parquet_lib}")
363371
endif ()
364372

365373
if (REFLECTCPP_TOML OR REFLECTCPP_CHECK_HEADERS)

0 commit comments

Comments
 (0)