walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

cmake: fix installing nghttp2_asio.pc, manpages, README.rst

This commit is contained in:
Peter Wu 2016-02-16 16:19:28 +01:00
parent 77e8190b6c
commit 4814d14db5
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -414,6 +414,8 @@ include_directories(
# For use in src/CMakeLists.txt # For use in src/CMakeLists.txt
set(PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}") set(PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}")
install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}")
add_subdirectory(lib) add_subdirectory(lib)
#add_subdirectory(lib/includes) #add_subdirectory(lib/includes)
add_subdirectory(third-party) add_subdirectory(third-party)

18
doc/CMakeLists.txt
View File

@ -122,6 +122,13 @@ set(APIDOCS
nghttp2_version.rst nghttp2_version.rst
) )
set(MAN_PAGES
nghttp.1
nghttpd.1
nghttpx.1
h2load.1
)
# Other .rst files from the source tree that need to be copied # Other .rst files from the source tree that need to be copied
# XXX move them to sources/ and create .in files? # XXX move them to sources/ and create .in files?
set(RST_FILES set(RST_FILES
@ -168,10 +175,7 @@ set(EXTRA_DIST
_themes/sphinx_rtd_theme/static/js/theme.js _themes/sphinx_rtd_theme/static/js/theme.js
_themes/sphinx_rtd_theme/theme.conf _themes/sphinx_rtd_theme/theme.conf
_themes/sphinx_rtd_theme/versions.html _themes/sphinx_rtd_theme/versions.html
nghttp.1 ${MAN_PAGES}
nghttpd.1
nghttpx.1
h2load.1
bash_completion/nghttp bash_completion/nghttp
bash_completion/nghttpd bash_completion/nghttpd
bash_completion/nghttpx bash_completion/nghttpx
@ -310,3 +314,9 @@ sphinxbuild(doctest
"Testing of doctests in the sources finished, look at the" "Testing of doctests in the sources finished, look at the"
"results in ${BUILDDIR}/doctest/output.txt." "results in ${BUILDDIR}/doctest/output.txt."
) )
foreach(_man_page IN LISTS MAN_PAGES)
install(FILES ${_man_page}
DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
)
endforeach()

2
src/CMakeLists.txt
View File

@ -253,6 +253,6 @@ if(ENABLE_ASIO_LIB)
install(TARGETS nghttp2_asio install(TARGETS nghttp2_asio
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(FILES libnghttp2_asio.pc install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2_asio.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
endif() endif()