@@ -278,17 +278,14 @@ if(REFLECTCPP_BSON OR REFLECTCPP_CHECK_HEADERS)
278278 src/reflectcpp_bson.cpp
279279 )
280280
281+ # The package and target names have changed since v2: https://github.com/mongodb/mongo-c-driver/releases/tag/2.0.0
282+ # bson-1.0 is for compatibility with older versions
281283 find_package (bson 1.25.1 CONFIG REQUIRED NAMES bson bson-1.0 )
282284
283- # The package and target names have changed since v2
284- # https://github.com/mongodb/mongo-c-driver/releases/tag/2.0.0
285285 set (bson_lib bson::${preferred_lib_type} )
286286 if (NOT TARGET "${bson_lib} " )
287+ # fallback to old target name
287288 set (bson_lib mongo::bson_${preferred_lib_type} )
288-
289- if (NOT TARGET "${bson_lib} " )
290- message (FATAL_ERROR "Could not find a suitable libbson library target to link with" )
291- endif ()
292289 endif ()
293290
294291 target_link_libraries (reflectcpp PUBLIC "${bson_lib} " )
@@ -326,10 +323,8 @@ if(REFLECTCPP_CSV OR REFLECTCPP_CHECK_HEADERS)
326323 set (arrow_lib Arrow::arrow_${preferred_lib_type} )
327324 elseif (TARGET Arrow::arrow_static)
328325 set (arrow_lib Arrow::arrow_static)
329- elseif (TARGET Arrow::arrow_shared)
330- set (arrow_lib Arrow::arrow_shared)
331326 else ()
332- message ( FATAL_ERROR "Could not find a suitable Arrow library target to link with" )
327+ set (arrow_lib Arrow::arrow_shared )
333328 endif ()
334329
335330 target_link_libraries (reflectcpp PUBLIC "${arrow_lib} " )
@@ -344,10 +339,8 @@ if(REFLECTCPP_FLEXBUFFERS OR REFLECTCPP_CHECK_HEADERS)
344339
345340 if (REFLECTCPP_BUILD_SHARED AND TARGET flatbuffers::flatbuffers_shared)
346341 set (flatbuf_lib flatbuffers::flatbuffers_shared)
347- elseif (TARGET flatbuffers::flatbuffers)
348- set (flatbuf_lib flatbuffers::flatbuffers)
349342 else ()
350- message ( FATAL_ERROR "Could not find a suitable FlatBuffers library target to link with" )
343+ set (flatbuf_lib flatbuffers::flatbuffers )
351344 endif ()
352345
353346 target_link_libraries (reflectcpp PUBLIC "${flatbuf_lib} " )
@@ -362,12 +355,8 @@ if(REFLECTCPP_MSGPACK OR REFLECTCPP_CHECK_HEADERS)
362355
363356 if (NOT REFLECTCPP_BUILD_SHARED AND TARGET msgpack-c-static)
364357 set (msgpack_lib msgpack-c-static)
365- elseif (TARGET msgpack-c)
366- set (msgpack_lib msgpack-c)
367- elseif (TARGET msgpack)
368- set (msgpack_lib msgpack)
369358 else ()
370- message ( FATAL_ERROR "Could not find a suitable msgpack-c library target to link with" )
359+ set (msgpack_lib msgpack-c)
371360 endif ()
372361
373362 target_link_libraries (reflectcpp PUBLIC "${msgpack_lib} " )
@@ -381,10 +370,8 @@ if(REFLECTCPP_PARQUET OR REFLECTCPP_CHECK_HEADERS)
381370 set (arrow_lib Arrow::arrow_${preferred_lib_type} )
382371 elseif (TARGET Arrow::arrow_static)
383372 set (arrow_lib Arrow::arrow_static)
384- elseif (TARGET Arrow::arrow_shared)
385- set (arrow_lib Arrow::arrow_shared)
386373 else ()
387- message ( FATAL_ERROR "Could not find a suitable Arrow library target to link with" )
374+ set (arrow_lib Arrow::arrow_shared )
388375 endif ()
389376 endif ()
390377
@@ -396,10 +383,8 @@ if(REFLECTCPP_PARQUET OR REFLECTCPP_CHECK_HEADERS)
396383 set (parquet_lib Parquet::parquet_${preferred_lib_type} )
397384 elseif (TARGET Parquet::parquet_static)
398385 set (parquet_lib Parquet::parquet_static)
399- elseif (TARGET Parquet::parquet_shared)
400- set (parquet_lib Parquet::parquet_shared)
401386 else ()
402- message ( FATAL_ERROR "Could not find a suitable Parquet library target to link with" )
387+ set (parquet_lib Parquet::parquet_shared )
403388 endif ()
404389
405390 target_link_libraries (reflectcpp PUBLIC "${arrow_lib} " "${parquet_lib} " )
0 commit comments