diff options
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/AddEventLibrary.cmake | 8 | ||||
-rw-r--r-- | cmake/LibeventConfig.cmake.in | 8 | ||||
-rw-r--r-- | cmake/UseDoxygen.cmake | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake index 9af39441..3d53258c 100644 --- a/cmake/AddEventLibrary.cmake +++ b/cmake/AddEventLibrary.cmake @@ -13,8 +13,8 @@ endmacro() macro(generate_pkgconfig LIB_NAME) set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${CMAKE_INSTALL_PREFIX}) - set(libdir ${CMAKE_INSTALL_PREFIX}/lib) - set(includedir ${CMAKE_INSTALL_PREFIX}/include) + set(libdir ${CMAKE_INSTALL_LIBDIR}) + set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) set(VERSION ${EVENT_ABI_LIBVERSION}) @@ -31,7 +31,7 @@ macro(generate_pkgconfig LIB_NAME) configure_file("lib${LIB_NAME}.pc.in" "lib${LIB_NAME}.pc" @ONLY) install( FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_NAME}.pc" - DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" ) endmacro() @@ -151,7 +151,7 @@ macro(add_event_library LIB_NAME) set_target_properties( "${LIB_NAME}_shared" PROPERTIES OUTPUT_NAME "${LIB_NAME}-${EVENT_PACKAGE_RELEASE}.${CURRENT_MINUS_AGE}" - INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" + INSTALL_NAME_DIR "${CMAKE_INSTALL_LIBDIR}" LINK_FLAGS "-compatibility_version ${COMPATIBILITY_VERSION} -current_version ${COMPATIBILITY_VERSION}.${EVENT_ABI_LIBVERSION_REVISION}") else() math(EXPR CURRENT_MINUS_AGE "${EVENT_ABI_LIBVERSION_CURRENT}-${EVENT_ABI_LIBVERSION_AGE}") diff --git a/cmake/LibeventConfig.cmake.in b/cmake/LibeventConfig.cmake.in index a12fc23c..582739fa 100644 --- a/cmake/LibeventConfig.cmake.in +++ b/cmake/LibeventConfig.cmake.in @@ -58,7 +58,6 @@ endif() # Get the path of the current file. get_filename_component(LIBEVENT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_INSTALL_PREFIX "${LIBEVENT_CMAKE_DIR}/../../.." ABSOLUTE) macro(message_if_needed _flag _msg) if (NOT ${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) @@ -116,7 +115,7 @@ if(CONFIG_FOR_INSTALL_TREE) unset(_event_h CACHE) find_path(_event_h NAMES event2/event.h - PATHS "${_INSTALL_PREFIX}/include" + PATHS "@CMAKE_INSTALL_INCLUDEDIR@" NO_DEFAULT_PATH) if(_event_h) set(LIBEVENT_INCLUDE_DIRS "${_event_h}") @@ -135,7 +134,7 @@ if(CONFIG_FOR_INSTALL_TREE) NO_DEFAULT_PATH) find_library(_event_lib_rel NAMES "event_${_comp}" - PATHS "${_INSTALL_PREFIX}/lib" + PATHS "@CMAKE_INSTALL_LIBDIR@" NO_DEFAULT_PATH) if(_event_lib_rel OR _event_lib_dbg) list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}") @@ -167,7 +166,7 @@ set(LIBEVENT_INCLUDE_DIR ${LIBEVENT_INCLUDE_DIRS}) if(LIBEVENT_LIBRARIES) set(LIBEVENT_LIBRARY ${LIBEVENT_LIBRARIES}) if(CONFIG_FOR_INSTALL_TREE) - message_if_needed(STATUS "Found libevent ${LIBEVENT_VERSION} in ${_INSTALL_PREFIX}") + message_if_needed(STATUS "Found libevent ${LIBEVENT_VERSION} in @CMAKE_INSTALL_LIBDIR@") else() message_if_needed(STATUS "Found libevent ${LIBEVENT_VERSION} in ${LIBEVENT_CMAKE_DIR}") endif() @@ -190,4 +189,3 @@ unset(_LIB_TYPE) unset(_AVAILABLE_LIBS) unset(_EVENT_COMPONENTS) unset(_POSSIBLE_PKG_NAMES) -unset(_INSTALL_PREFIX) diff --git a/cmake/UseDoxygen.cmake b/cmake/UseDoxygen.cmake index c7e4b175..292aaaa4 100644 --- a/cmake/UseDoxygen.cmake +++ b/cmake/UseDoxygen.cmake @@ -90,7 +90,7 @@ macro(UseDoxygen) if ("${DOXYGEN_GENERATE_HTML}" STREQUAL "YES") install(DIRECTORY ${PROJECT_BINARY_DIR}/${DOXYGEN_OUTPUT_DIRECTORY}/html - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME} + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME} COMPONENT doc ) endif() @@ -106,7 +106,7 @@ macro(UseDoxygen) # Install manual into <prefix>/share/man/man3 install(DIRECTORY ${MAN_PAGES_DIR} - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man COMPONENT doc ) endif() |