Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nghttp2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
nghttp2
Commits
4814d14d
Commit
4814d14d
authored
Feb 16, 2016
by
Peter Wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: fix installing nghttp2_asio.pc, manpages, README.rst
parent
77e8190b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
5 deletions
+17
-5
CMakeLists.txt
CMakeLists.txt
+2
-0
doc/CMakeLists.txt
doc/CMakeLists.txt
+14
-4
src/CMakeLists.txt
src/CMakeLists.txt
+1
-1
No files found.
CMakeLists.txt
View file @
4814d14d
...
...
@@ -414,6 +414,8 @@ include_directories(
# For use in src/CMakeLists.txt
set
(
PKGDATADIR
"
${
CMAKE_INSTALL_FULL_DATADIR
}
/
${
CMAKE_PROJECT_NAME
}
"
)
install
(
FILES README.rst DESTINATION
"
${
CMAKE_INSTALL_DOCDIR
}
"
)
add_subdirectory
(
lib
)
#add_subdirectory(lib/includes)
add_subdirectory
(
third-party
)
...
...
doc/CMakeLists.txt
View file @
4814d14d
...
...
@@ -122,6 +122,13 @@ set(APIDOCS
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
# XXX move them to sources/ and create .in files?
set
(
RST_FILES
...
...
@@ -168,10 +175,7 @@ set(EXTRA_DIST
_themes/sphinx_rtd_theme/static/js/theme.js
_themes/sphinx_rtd_theme/theme.conf
_themes/sphinx_rtd_theme/versions.html
nghttp.1
nghttpd.1
nghttpx.1
h2load.1
${
MAN_PAGES
}
bash_completion/nghttp
bash_completion/nghttpd
bash_completion/nghttpx
...
...
@@ -310,3 +314,9 @@ sphinxbuild(doctest
"Testing of doctests in the sources finished, look at the"
"results in
${
BUILDDIR
}
/doctest/output.txt."
)
foreach
(
_man_page IN LISTS MAN_PAGES
)
install
(
FILES
${
_man_page
}
DESTINATION
"
${
CMAKE_INSTALL_MANDIR
}
/man1"
)
endforeach
()
src/CMakeLists.txt
View file @
4814d14d
...
...
@@ -253,6 +253,6 @@ if(ENABLE_ASIO_LIB)
install
(
TARGETS nghttp2_asio
LIBRARY DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
"
)
install
(
FILES
libnghttp2_asio.pc
install
(
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/libnghttp2_asio.pc"
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
/pkgconfig"
)
endif
()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment