Skip to content

Commit 58d10dd

Browse files
Reference Json differently (#90)
1 parent 39f6cb1 commit 58d10dd

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ find_package(jsoncpp REQUIRED)
3838
# jsoncpp has different target names depending on whether it
3939
# was built as a shared or static library. We make this override-able
4040
# so we can be resilient to the changes between versions.
41-
set(JSONCPP_LIB "jsoncpp_object" CACHE STRING "jsoncpp target name")
41+
if(WIN32)
42+
set(JSONCPP_LIB "jsoncpp_lib" CACHE STRING "jsoncpp target name")
43+
else()
44+
set(JSONCPP_LIB "jsoncpp_static" CACHE STRING "jsoncpp target name")
45+
endif()
4246

4347
if(USE_MSGPACK)
4448
find_package(msgpack CONFIG REQUIRED)

src/signalrclient/microsoft-signalr-config.in.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if(@USE_CPPRESTSDK@)
44
find_dependency(cpprestsdk)
55
endif()
66

7-
find_dependency(@JSONCPP_LIB@)
7+
find_dependency(jsoncpp)
88

99
if(@USE_MSGPACK@)
1010
find_dependency(msgpack)

submodules/vcpkg

Submodule vcpkg updated 4480 files

0 commit comments

Comments
 (0)