Skip to content

Commit f8a50aa

Browse files
committed
fix for msgpack-c as well
1 parent fb04e3c commit f8a50aa

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,12 @@ if (REFLECTCPP_MSGPACK OR REFLECTCPP_CHECK_HEADERS)
346346
list(APPEND REFLECT_CPP_SOURCES
347347
src/reflectcpp_msgpack.cpp
348348
)
349-
if (NOT TARGET msgpack-c)
350-
find_package(msgpack-c CONFIG REQUIRED NAMES msgpack msgpack-c msgpackc)
349+
find_package(msgpack-c CONFIG REQUIRED NAMES msgpack msgpack-c msgpackc)
350+
if(NOT REFLECTCPP_BUILD_SHARED AND TARGET msgpack-c-static)
351+
target_link_libraries(reflectcpp PUBLIC msgpack-c-static)
352+
else()
353+
target_link_libraries(reflectcpp PUBLIC msgpack-c)
351354
endif()
352-
target_link_libraries(reflectcpp PUBLIC $<IF:$<TARGET_EXISTS:msgpack-c>,msgpack-c,$<IF:$<TARGET_EXISTS:msgpackc>,msgpackc,msgpack-c>>)
353355
endif ()
354356

355357
if (REFLECTCPP_PARQUET OR REFLECTCPP_CHECK_HEADERS)

vcpkg.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
{
7777
"name": "arrow",
7878
"version>=": "21.0.0",
79-
"default-features": false,
8079
"features": ["csv"]
8180
}
8281
]

0 commit comments

Comments
 (0)