Commit db241598 authored by Jason S Zang's avatar Jason S Zang

Use GNUInstallDirs to determine install destinations for better compatibility

parent 0e758d3c
...@@ -29,6 +29,8 @@ if(WITH_DEBUG_SYMBOLS) ...@@ -29,6 +29,8 @@ if(WITH_DEBUG_SYMBOLS)
set(DEBUG_SYMBOL "-g") set(DEBUG_SYMBOL "-g")
endif() endif()
include(GNUInstallDirs)
configure_file(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_SOURCE_DIR}/src/butil/config.h @ONLY) configure_file(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_SOURCE_DIR}/src/butil/config.h @ONLY)
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
...@@ -337,7 +339,7 @@ file(COPY ${CMAKE_SOURCE_DIR}/src/ ...@@ -337,7 +339,7 @@ file(COPY ${CMAKE_SOURCE_DIR}/src/
PATTERN "*.hpp" PATTERN "*.hpp"
) )
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/output/include/ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/output/include/
DESTINATION include DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
FILES_MATCHING FILES_MATCHING
PATTERN "*.h" PATTERN "*.h"
PATTERN "*.hpp" PATTERN "*.hpp"
......
...@@ -37,23 +37,15 @@ set(protoc_gen_mcpack_SOURCES ...@@ -37,23 +37,15 @@ set(protoc_gen_mcpack_SOURCES
add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES}) add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES})
target_link_libraries(protoc-gen-mcpack brpc-shared) target_link_libraries(protoc-gen-mcpack brpc-shared)
get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
if ("${LIB64}" STREQUAL "TRUE")
set(LIBSUFFIX 64)
else()
set(LIBSUFFIX "")
endif()
#install directory #install directory
# cmake -DCMAKE_INSTALL_PREFIX=/usr
install(TARGETS brpc-shared install(TARGETS brpc-shared
RUNTIME DESTINATION bin RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION lib${LIBSUFFIX} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION lib${LIBSUFFIX} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
install(TARGETS brpc-static install(TARGETS brpc-static
RUNTIME DESTINATION bin RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION lib${LIBSUFFIX} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION lib${LIBSUFFIX} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment