add cmake nghttp2 support #922

remoe · 2016-07-21T09:31:11Z

No description provided.

mention-bot · 2016-07-21T09:31:12Z

@remoe, thanks for your PR! By analyzing the annotation information on this pull request, we identified @Sukender, @jzakrzewski and @billhoffman to be potential reviewers

Lekensteyn · 2016-08-10T12:18:03Z

CMake/FindNGHTTP2.cmake

+find_path(NGHTTP2_INCLUDE_DIR "nghttp2/nghttp2.h"
+          HINTS ${NGHTTP2_DIR}/include ${NGHTTP2_DIR}/inc)
+
+find_library(NGHTTP2_LIBRARY_RELEASE NAMES NGHTTP2LIB


Name should be lowercase to work on case-sensitive filesystems (Linux).

@bradking is this appropriate use of select_library_configurations in a FindXXX.cmake file?

bradking · 2016-08-10T13:09:50Z

Please see cmake-developer(7) for documentation of find module variable names. The NGHTTP2_INCLUDE_DIR value should not be used by clients directly. It is only a cache entry to hold the location of a specific include directory. Instead a NGHTTP2_INCLUDE_DIRS variable should provide the result (in case additional directories are needed later).

bagder · 2016-09-04T11:26:07Z

@remoe, can we hope for an update to this in line with @bradking's comments?

remoe · 2016-09-04T13:32:58Z

@bagder , ready to merge ?

bagder · 2016-09-04T16:40:15Z

I'll await a 👍 or two from some of the more cmake oriented people first.

Lekensteyn · 2016-09-04T19:58:40Z

👎 FindNGHTTP2.cmake is not good:

The release/debug libs are looked up in the same dir. Why bother then with calling select_library_configurations?
The nghttp2 names are non-standard.

nghttp2 (in lib/Makefile.msvc) uses the name nghttp2.lib. On Linux the library is called libnghttp2.so. Then why not replace the two find_library and single select_library_configurations by:

find_library(NGHTTP2_LIBRARY NAMES nghttp2)

Note the lower-case nghttp2. NGHTTP2_DIR is not needed if you set CMAKE_LIBRARY_PATH appropriately. (Similarly for the find_path, the NGHTTP2_DIR can be removed in favor of setting CMAKE_INCLUDE_PATH).

remoe · 2016-09-04T20:51:37Z

I've tested it on windows. I prefer not to use global settings like CMAKE_* for paths on windows. About the names: you're right, it could this doesn't find the library on linux.

Lekensteyn · 2016-09-04T21:38:31Z

How did you build nghttp2 on Windows? Using its cmake system, the lib/Makefile.msvc or something else?

CMAKE_LIBRARY_PATH and friends are supposed to be set by the user (e.g. using cmake-gui), are you avoiding them because you find it more convenient to set a single NGHTTP2_DIR variable?

remoe · 2016-09-05T06:17:35Z

I've build nghttp2 1.12.0 with CMake on Windows.
CMake has pre and post suffixes for library names, so it could work without any changes on linux ( @bradking ? ).

bradking · 2016-09-05T12:39:17Z

@Lekensteyn's comments still need to be addressed:

The find_library call should specify the library file name in lower case.
The use of select_library_configurations is not necessary unless we expect the library file to have different names per-configuration.
CMake currently discourages use of per-package root variables as NGHTTP2_DIR is used here. Instead one can set CMAKE_PREFIX_PATH to get both find_library and find_path to look in appropriate locations (and it can be a list to work for multiple packages). If one does use a per-package root variable then the name should be something other than NGHTTP2_DIR because that would be reserved for use if upstream every distributes a CMake package configuration file.

remoe · 2016-09-05T17:20:20Z

@Lekensteyn , @bradking thanks.

bradking · 2016-09-05T17:26:32Z

CMake/FindNGHTTP2.cmake

+
+find_path(NGHTTP2_INCLUDE_DIR "nghttp2/nghttp2.h")
+
+find_library(NGHTTP2_LIBRARY NAMES nghttp2 libnghttp2)


CMake does automatically add a lib prefix when searching on platforms that use it. This can be just

find_library(NGHTTP2_LIBRARY NAMES nghttp2)

Lekensteyn · 2016-09-06T13:19:40Z

CMake/FindNGHTTP2.cmake

+
+find_package_handle_standard_args(NGHTTP2
+    FOUND_VAR 
+      NGHTTP2_FOUND


FOUND_VAR NGHTTP2_FOUND is the default so you could omit that

Lekensteyn · 2016-09-06T13:27:50Z

Change looks good, I'll give this a test on Linux.

Oh, and please use Unix line endings in FindNGHTTP2.cmake

Lekensteyn · 2016-09-06T13:32:39Z

This fails to build if nghttp2 is not installed. Maybe use find_package(NGHTTP2 REQUIRED) or rename the option?

remoe · 2016-10-10T12:37:34Z

@Lekensteyn @bagder I've tested it now with USE_NGHTTP2 ON/OFF.

Windows (win64 VS2015) curl binary version dump with OFF:

curl 7.51.0-DEV (Windows) libcurl/7.51.0-DEV OpenSSL/1.0.2h zlib/1.2.8
Protocols: http https smb smbs
Features: AsynchDNS IPv6 Largefile NTLM SSL libz

Version dump with ON:

curl 7.51.0-DEV (Windows) libcurl/7.51.0-DEV OpenSSL/1.0.2h zlib/1.2.8 nghttp2/1.12.0
Protocols: http https smb smbs
Features: AsynchDNS IPv6 Largefile NTLM SSL libz HTTP2

bagder · 2016-10-10T12:59:15Z

And does it now also work fine to build even if nghttp2 is not installed/found? @Lekensteyn remarked on that on Sep 6.

remoe · 2016-10-10T13:00:05Z

yes

Lekensteyn

The current patch looks good for merging.

Lekensteyn · 2016-10-10T13:35:56Z

CMakeLists.txt

+option(USE_NGHTTP2 "Use Nghttp2 library" OFF)
+if(USE_NGHTTP2)
+  find_package(NGHTTP2 REQUIRED)
+  if(NGHTTP2_FOUND)


Note that this is strictly not necessary since you have REQUIRED for find_package.

bagder · 2016-10-10T17:48:28Z

Thanks a lot @remoe for your hard work on this. Squashed and merged now!

TDannhauer · 2016-10-10T19:26:16Z

I tested this PR, works like a charm.

However, of the latest stable release, the provided source code zip file is incomplete. It does not contain all CMake Modules required and available in git. Seems to be a simple packaging error..
After adding the modules from this repo, it works like a charm.

Thanks for the good job!

jay · 2016-10-10T19:36:49Z

However, of the latest stable release, the provided source code zip file is incomplete. It does not contain all CMake Modules required and available in git. Seems to be a simple packaging error..

@TDannhauer What's missing? I see FindCARES.cmake and FindLibSSH2.cmake are not in the release and should be added to CMAKE_DIST. Is there anything else? Do you want to take a shot at a PR?

TDannhauer · 2016-10-10T19:48:33Z

The package as defined in CMAKE_DIST contains

CMake/CMakeConfigurableFile.in
CMake/CurlTests.c
CMake/FindGSS.cmake
CMake/OtherTests.cmake
CMake/Platforms/WindowsCache.cmake
CMake/Utilities.cmake
include/curl/curlbuild.h.cmake
CMake/Macros.cmake
CMake/CurlSymbolHiding.cmake

However, the package did not contain:
CMake/CurlSymbolHiding.cmake
--> I don't know what's wrong there.

Additionally we have two missing files:

CMake/FindCARES.cmake
CMake/FindLibSSH2.cmake

Finally, we need also the brand new CMake/FindNGHTTP2.cmake, which was added with the PR of this thread.

jay · 2016-10-10T19:58:01Z

CurlSymbolHiding issue was fixed in 82279c8 which was after 7.50.3 was released. The three missing files I agree. Do you want to open a PR with those changes?

TDannhauer · 2016-10-10T19:59:38Z

Ah thanks.

I will try, I'm not used to the workflow, so it will be a fight against gihub, give me some minutes. :)

TDannhauer · 2016-10-10T20:21:19Z

Do I need to make the PR in master branch oder another branch? sorry, I'm not used to it....

bagder · 2016-10-10T20:29:36Z

The easiest way is if you make a new branch dedicated for that fix only and you make a PR from that. That way you can update that individually if needed and you can delete it once the PR gets merged.

TDannhauer · 2016-10-10T20:46:19Z

Hm thanks.. Way back to the basics: What should I use? GitHub desktop, or Web interface?
I tried Github desktop:

cloned github repo
Create my branch
Edited Makefile.am
Commited changes to my branch
Tried to create a PR from my branch to master -> failed: "Sync failed to push local changes" (Missing Permission)

What might be the mistake?

Hmpf. the Github doc is very confusing for SVN guys without git experience...

TDannhauer · 2016-10-10T21:07:40Z

Is this repos a shared model approach, or do I need to fork?

Thanks for the baby sitting ;)

jay · 2016-10-10T21:10:12Z

Basically when you are working in git branches are cheap so you can just create a bunch of them. Your failure message may be because you are attempting to push directly upstream (here) and not to your origin (your fork of curl). The way you submit changes is push them to a branch in your fork and then when you go to your curl fork in github you will see the changes you have just pushed with a button "create pull request".

So first you need to go to the top of our project page and click the fork button and that will put a fork of the curl repo on your account, and then in the local repo:

# The canonical repo (us) should be 'upstream'
git remote rename origin upstream
git branch --set-upstream-to=upstream/master master

# Your fork should be 'origin'
git remote add -f origin git@github.com:TDannhauer/curl.git
git config branch.master.pushremote origin

# Ensure you're up-to-date
git checkout master
git fetch upstream && git merge --ff-only upstream/master

# Advice: don't work on master, start a new branch off of it
git checkout -b fix_cmake_dist

# Read https://github.com/curl/curl/blob/master/docs/CONTRIBUTE.md
# commit your changes

# push branch upstream
git push --set-upstream origin fix_cmake_dist

What gets kind of confusing is though 'upstream' is a typical name for the canonical repo you set a branch "upstream" meaning where you want it to land, which in this case is your fork 'origin'.

Also read https://github.com/curl/curl/blob/master/docs/CONTRIBUTE.md

TDannhauer · 2016-10-11T10:11:04Z

Hm, I hope I did it right: #1070

bagder added the cmake label Jul 21, 2016

Lekensteyn reviewed Aug 10, 2016
View reviewed changes

bradking reviewed Sep 5, 2016
View reviewed changes

add cmake nghttp2 support

0b94c23

remoe force-pushed the cmake-nghttp2 branch from dfab8e8 to 0b94c23 Compare September 5, 2016 18:42

Lekensteyn reviewed Sep 6, 2016
View reviewed changes

bagder added HTTP/2 needs-info labels Sep 24, 2016

bagder mentioned this pull request Oct 10, 2016

Windows build for nghttp2 supported? #184

Closed

remoe added 3 commits October 10, 2016 11:14

fix line endings

370ceae

Merge remote-tracking branch 'upstream/master' into cmake-nghttp2

60b0c13

fix build with USE_NGHTTP2 ON/OFF

563478b

Lekensteyn approved these changes Oct 10, 2016

View reviewed changes

fix minor detail with NGHTTP2_FOUND

50ebb12

bagder removed the needs-info label Oct 10, 2016

bagder closed this in d522ff4 Oct 10, 2016

lock bot locked as resolved and limited conversation to collaborators Jan 19, 2019

add cmake nghttp2 support #922

add cmake nghttp2 support #922

remoe commented Jul 21, 2016

mention-bot commented Jul 21, 2016

Lekensteyn Aug 10, 2016

bradking Aug 10, 2016

bradking commented Aug 10, 2016

bagder commented Sep 4, 2016

remoe commented Sep 4, 2016

bagder commented Sep 4, 2016

Lekensteyn commented Sep 4, 2016

remoe commented Sep 4, 2016 •

edited

Lekensteyn commented Sep 4, 2016

remoe commented Sep 5, 2016 •

edited

bradking commented Sep 5, 2016

remoe commented Sep 5, 2016

bradking Sep 5, 2016

Lekensteyn Sep 6, 2016

Lekensteyn commented Sep 6, 2016 •

edited

Lekensteyn commented Sep 6, 2016

remoe commented Oct 10, 2016 •

edited

bagder commented Oct 10, 2016

remoe commented Oct 10, 2016

Lekensteyn left a comment

Lekensteyn Oct 10, 2016

bagder commented Oct 10, 2016

TDannhauer commented Oct 10, 2016

jay commented Oct 10, 2016

TDannhauer commented Oct 10, 2016 •

edited

jay commented Oct 10, 2016

TDannhauer commented Oct 10, 2016

TDannhauer commented Oct 10, 2016

bagder commented Oct 10, 2016 •

edited

TDannhauer commented Oct 10, 2016

TDannhauer commented Oct 10, 2016 •

edited

jay commented Oct 10, 2016

TDannhauer commented Oct 11, 2016 •

edited


		find_path(NGHTTP2_INCLUDE_DIR "nghttp2/nghttp2.h")

		find_library(NGHTTP2_LIBRARY NAMES nghttp2 libnghttp2)

add cmake nghttp2 support #922

add cmake nghttp2 support #922

Conversation

remoe commented Jul 21, 2016

mention-bot commented Jul 21, 2016

Lekensteyn Aug 10, 2016

Choose a reason for hiding this comment

bradking Aug 10, 2016

Choose a reason for hiding this comment

bradking commented Aug 10, 2016

bagder commented Sep 4, 2016

remoe commented Sep 4, 2016

bagder commented Sep 4, 2016

Lekensteyn commented Sep 4, 2016

remoe commented Sep 4, 2016 • edited

Lekensteyn commented Sep 4, 2016

remoe commented Sep 5, 2016 • edited

bradking commented Sep 5, 2016

remoe commented Sep 5, 2016

bradking Sep 5, 2016

Choose a reason for hiding this comment

Lekensteyn Sep 6, 2016

Choose a reason for hiding this comment

Lekensteyn commented Sep 6, 2016 • edited

Lekensteyn commented Sep 6, 2016

remoe commented Oct 10, 2016 • edited

bagder commented Oct 10, 2016

remoe commented Oct 10, 2016

Lekensteyn left a comment

Choose a reason for hiding this comment

Lekensteyn Oct 10, 2016

Choose a reason for hiding this comment

bagder commented Oct 10, 2016

TDannhauer commented Oct 10, 2016

jay commented Oct 10, 2016

TDannhauer commented Oct 10, 2016 • edited

jay commented Oct 10, 2016

TDannhauer commented Oct 10, 2016

TDannhauer commented Oct 10, 2016

bagder commented Oct 10, 2016 • edited

TDannhauer commented Oct 10, 2016

TDannhauer commented Oct 10, 2016 • edited

jay commented Oct 10, 2016

TDannhauer commented Oct 11, 2016 • edited

remoe commented Sep 4, 2016 •

edited

remoe commented Sep 5, 2016 •

edited

Lekensteyn commented Sep 6, 2016 •

edited

remoe commented Oct 10, 2016 •

edited

TDannhauer commented Oct 10, 2016 •

edited

bagder commented Oct 10, 2016 •

edited

TDannhauer commented Oct 10, 2016 •

edited

TDannhauer commented Oct 11, 2016 •

edited