Merge pull request #1303 from donny-dont/fix-shared-install

Explicitly set install location when building shared libs
This commit is contained in:
Tatsuhiro Tsujikawa 2019-02-20 00:10:50 +09:00 committed by GitHub
commit adf09f2124
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View File

@ -51,7 +51,9 @@ if(ENABLE_SHARED_LIB)
) )
install(TARGETS nghttp2 install(TARGETS nghttp2
DESTINATION "${CMAKE_INSTALL_LIBDIR}") ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
endif() endif()
if(HAVE_CUNIT OR ENABLE_STATIC_LIB) if(HAVE_CUNIT OR ENABLE_STATIC_LIB)

View File

@ -263,7 +263,9 @@ if(ENABLE_ASIO_LIB)
VERSION 1.0.0 SOVERSION 1) VERSION 1.0.0 SOVERSION 1)
install(TARGETS nghttp2_asio install(TARGETS nghttp2_asio
DESTINATION "${CMAKE_INSTALL_LIBDIR}") ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2_asio.pc" install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2_asio.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")