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

Also install the brotli headers when building the shared libraries. #326 #437

Merged
merged 6 commits into from
Oct 12, 2016
Merged

Also install the brotli headers when building the shared libraries. #326 #437

merged 6 commits into from
Oct 12, 2016

Conversation

fred-wang
Copy link
Contributor

No description provided.

@fred-wang fred-wang mentioned this pull request Oct 7, 2016
@fred-wang
Copy link
Contributor Author

@eustas Can you please take a look to that one-line change? I think this is the remaining important bit to fix issue #326 . The travis failures seem to happen on BUILD_SYSTEM=python, so that should be unrelated to CMake changes?

@eustas
Copy link
Collaborator

eustas commented Oct 12, 2016

I think it should be:

  if(NOT WIN32)
    install(DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  endif()

@fred-wang
Copy link
Contributor Author

@eustas OK, that works for me too (let's see later if some Cygwin or MSYS2 maintainers complain...). I updated the pull request.

@eustas
Copy link
Collaborator

eustas commented Oct 12, 2016

I meant, it should be outside of "is shared libs", because when linking statically, includes required as well =)

@fred-wang
Copy link
Contributor Author

@eustas OK, but at the moment we do not install the libraries at all when building in static mode, so the headers are not going to be used anyway. Maybe we want to remove the whole if(BUILD_SHARED_LIBS) here so that we also install the lib & include in static mode too?

@eustas
Copy link
Collaborator

eustas commented Oct 12, 2016

Sounds logical.

@fred-wang
Copy link
Contributor Author

@eustas OK, done.

@eustas
Copy link
Collaborator

eustas commented Oct 12, 2016

One last thing (sorry): any reason not to use paths provided by GNUInstallDirs?
I'm not very experienced in that matter, but it feels like this will make build a bit more portable.
(${CMAKE_INSTALL_INCLUDEDIR}, ...)

@eustas
Copy link
Collaborator

eustas commented Oct 12, 2016

And CMake wants ARCHIVE DESTINATION as well...

@fred-wang
Copy link
Contributor Author

@eustas updated the install directory, but not sure what you mean with your last comment?
(PS: feel free to take over this work if that's faster, I'm not experienced with all these cmake build configs either...)

@eustas eustas merged commit 85817be into google:master Oct 12, 2016
@fred-wang fred-wang deleted the cmake-include branch October 12, 2016 15:42
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.

2 participants