Reference Json differently (#90)
This commit is contained in:
Родитель
39f6cb1d32
Коммит
58d10dd472
|
@ -38,7 +38,11 @@ find_package(jsoncpp REQUIRED)
|
|||
# jsoncpp has different target names depending on whether it
|
||||
# was built as a shared or static library. We make this override-able
|
||||
# so we can be resilient to the changes between versions.
|
||||
set(JSONCPP_LIB "jsoncpp_object" CACHE STRING "jsoncpp target name")
|
||||
if(WIN32)
|
||||
set(JSONCPP_LIB "jsoncpp_lib" CACHE STRING "jsoncpp target name")
|
||||
else()
|
||||
set(JSONCPP_LIB "jsoncpp_static" CACHE STRING "jsoncpp target name")
|
||||
endif()
|
||||
|
||||
if(USE_MSGPACK)
|
||||
find_package(msgpack CONFIG REQUIRED)
|
||||
|
|
|
@ -4,7 +4,7 @@ if(@USE_CPPRESTSDK@)
|
|||
find_dependency(cpprestsdk)
|
||||
endif()
|
||||
|
||||
find_dependency(@JSONCPP_LIB@)
|
||||
find_dependency(jsoncpp)
|
||||
|
||||
if(@USE_MSGPACK@)
|
||||
find_dependency(msgpack)
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 9836ae4f2671db41e07843f31b4e341f0d3ebfb1
|
||||
Subproject commit 934a99dc13cabb330824ae1a5ab4a53a9acc5a49
|
Загрузка…
Ссылка в новой задаче