Skip to content

[signalrclient] fix cpprestsdk linkage #6606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 1 commit into from
May 24, 2019
Merged

[signalrclient] fix cpprestsdk linkage #6606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions ports/signalrclient/0002_fix-compile-error.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,19 @@ index 91c2300..2439fec 100644
set(CPPREST_INCLUDE_DIR "" CACHE FILEPATH "Path to casablanca include dir")

include_directories (
@@ -22,6 +24,7 @@ if(NOT DISABLE_TESTS)
add_subdirectory(test)
endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 506680d04..d8bd404a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories (
include
"${CPPREST_INCLUDE_DIR}")

+
if(BUILD_SHARED_LIBS)
install(FILES include/signalrclient/_exports.h DESTINATION include/signalrclient)
else()
-find_library(CPPREST_SO NAMES "cpprest" PATHS ${CPPREST_LIB_DIR} REQUIRED)
+find_package(cpprestsdk REQUIRED)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
diff --git a/src/signalrclient/CMakeLists.txt b/src/signalrclient/CMakeLists.txt
index db141eb..c4306d8 100644
--- a/src/signalrclient/CMakeLists.txt
Expand All @@ -28,7 +33,7 @@ index db141eb..c4306d8 100644
add_library (signalrclient ${SOURCES})

-target_link_libraries(signalrclient ${CPPREST_SO})
+target_link_libraries(signalrclient ${CPPREST_SO} OpenSSL::SSL OpenSSL::Crypto)
+target_link_libraries(signalrclient cpprestsdk::cpprest OpenSSL::SSL OpenSSL::Crypto)

install(
TARGETS signalrclient
2 changes: 1 addition & 1 deletion ports/signalrclient/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: signalrclient
Version: 1.0.0-beta1-5
Version: 1.0.0-beta1-6
Build-Depends: cpprestsdk, openssl
Description: C++ client for SignalR.