Use CMAKE_INSTALL_FULL_LIBDIR from the GNUInstallDirs module

This commit is contained in:
Frederik Deweerdt 2016-11-14 14:50:11 -08:00
parent 62d8feec7c
commit 378433c4ef
3 changed files with 4 additions and 5 deletions

View File

@ -35,7 +35,8 @@ SET(LIBRARY_VERSION_PATCH "0")
SET(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}${VERSION_PRERELEASE}")
SET(LIBRARY_SOVERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}")
GET_FILENAME_COMPONENT(H2O_INSTALL_LIBDIR_BASE "${CMAKE_INSTALL_LIBDIR}" NAME)
INCLUDE(GNUInstallDirs)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/include/h2o/version.h)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libh2o.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libh2o.pc @ONLY)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libh2o-evloop.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libh2o-evloop.pc @ONLY)
@ -48,8 +49,6 @@ FIND_PACKAGE(Threads REQUIRED)
FIND_PACKAGE(OpenSSL)
FIND_PACKAGE(ZLIB REQUIRED)
INCLUDE(GNUInstallDirs)
SET(WITH_BUNDLED_SSL_DEFAULT "ON")
IF ((NOT UNIX) OR CYGWIN)
SET(WITH_BUNDLED_SSL_DEFAULT "OFF")

View File

@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
includedir=${prefix}/include
libdir=${prefix}/@H2O_INSTALL_LIBDIR_BASE@
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
Name: libh2o-evloop
Description: An optimized HTTP/1.x & HTTP/2 library

View File

@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
includedir=${prefix}/include
libdir=${prefix}/@H2O_INSTALL_LIBDIR_BASE@
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
Name: libh2o
Description: An optimized HTTP/1.x & HTTP/2 library