Skip to content

Don't find websocketpp if not CPPREST_EXCLUDE_WEBSOCKETS. #1494

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

Closed
sighingnow wants to merge 1 commit into from
Closed

Don't find websocketpp if not CPPREST_EXCLUDE_WEBSOCKETS. #1494

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
6 changes: 4 additions & 2 deletions Release/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ elseif(CPPREST_WEBSOCKETS_IMPL STREQUAL "wspp")
websockets/client/ws_client_impl.h
websockets/client/ws_client_wspp.cpp
)
cpprest_find_websocketpp()
target_link_libraries(cpprest PRIVATE cpprestsdk_websocketpp_internal)
if(NOT CPPREST_EXCLUDE_WEBSOCKETS)
Copy link

@barcharcraz barcharcraz Sep 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is CPPREST_EXCLUDE_WEBSOCKETS ever actually set anywhere. From my reading this will result in no actual change, since CPPREST_EXCLUDE_WEBSOCKETS will expand to "" (and cause a warning) or "false" and thus websockets will be found

I could be missing something.

Copy link

@barcharcraz barcharcraz Sep 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose one could set it on the command line, but in that case it should really be an option

And given we already have CPPREST_WEBSOCKETS_IMPL I don't see what the point is.

Copy link
Contributor Author

@sighingnow sighingnow Sep 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing out the usage of CPPREST_WEBSOCKETS_IMPL and after reading the code about CPPREST_WEBSOCKETS_IMPL=none branch again I have realized that this PR is unncessary.

I will close this PR, and many thanks for your review!

cpprest_find_websocketpp()
target_link_libraries(cpprest PRIVATE cpprestsdk_websocketpp_internal)
endif()
cpprest_find_boost()
cpprest_find_openssl()
target_link_libraries(cpprest PUBLIC cpprestsdk_boost_internal cpprestsdk_openssl_internal)
Expand Down