Skip to content
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.

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

Fix various cmake issues #54

Closed
wants to merge 7 commits into from

Conversation

thefallentree
Copy link
Contributor

  1. Look for zlib and set HAVE_ZLIB
  2. Avoid building and installing doxygen if there is no doxgen.

thefallentree and others added 7 commits October 25, 2019 15:46
and remove the redundant TELNET_TELOPT_COMPRESS2 check

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
… return NULL

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
to handle the remote end close correctly

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
@@ -437,7 +436,8 @@ static void _negotiate(telnet_t *telnet, unsigned char telopt) {
break;
case Q_WANTNO_OP:
_set_rfc1143(telnet, telopt, Q_US(q), Q_WANTYES);
NEGOTIATE_EVENT(telnet, TELNET_EV_DO, telopt);
_send_negotiate(telnet, TELNET_DO, telopt);
Copy link
Owner

Choose a reason for hiding this comment

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

This don't seem to be related to the CMake issues; can you split these out to a separate PR? (Although I believe these are already addressed by another open PR.)

Copy link
Contributor

Choose a reason for hiding this comment

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

#57
I don't know why my PR mix into your PR.

@@ -1,11 +1,16 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
Copy link
Owner

Choose a reason for hiding this comment

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

Is this required? I'm tentative to bump the minimum required here without a really good reason.

@thefallentree
Copy link
Contributor Author

I should close this one for now to catch up until everyone else's has been merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants