| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | diff -uNr a/CMakeLists.txt b/CMakeLists.txt |
| 2 | --- a/CMakeLists.txt 2018-12-05 12:55:59.630792054 +0100 |
| 3 | +++ b/CMakeLists.txt 2018-12-05 13:00:22.922269200 +0100 |
| 4 | @@ -403,10 +403,15 @@ |
| 5 | |
| 6 | set_target_properties (glog PROPERTIES PUBLIC_HEADER "${GLOG_PUBLIC_H}") |
| 7 | |
| 8 | +set (_glog_CMake_BINDIR ${CMAKE_INSTALL_BINDIR}) |
| 9 | +set (_glog_CMake_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}) |
| 10 | +set (_glog_CMake_LIBDIR ${CMAKE_INSTALL_LIBDIR}) |
| 11 | +set (_glog_CMake_INSTALLDIR ${_glog_CMake_LIBDIR}/cmake/glog) |
| 12 | + |
| 13 | target_include_directories (glog BEFORE PUBLIC |
| 14 | "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" |
| 15 | "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>" |
| 16 | - "$<INSTALL_INTERFACE:include>" |
| 17 | + "$<INSTALL_INTERFACE:${_glog_CMake_INCLUDE_DIR}>" |
| 18 | PRIVATE ${CMAKE_CURRENT_BINARY_DIR} |
| 19 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) |
| 20 | |
| 21 | @@ -543,10 +548,10 @@ |
| 22 | |
| 23 | install (TARGETS glog |
| 24 | EXPORT glog-targets |
| 25 | - RUNTIME DESTINATION bin |
| 26 | - PUBLIC_HEADER DESTINATION include/glog |
| 27 | - LIBRARY DESTINATION lib |
| 28 | - ARCHIVE DESTINATION lib) |
| 29 | + RUNTIME DESTINATION ${_glog_CMake_BINDIR} |
| 30 | + PUBLIC_HEADER DESTINATION ${_glog_CMake_INCLUDE_DIR}/glog |
| 31 | + LIBRARY DESTINATION ${_glog_CMake_LIBDIR} |
| 32 | + ARCHIVE DESTINATION ${_glog_CMake_LIBDIR}) |
| 33 | |
| 34 | if (gflags_FOUND) |
| 35 | set (gflags_DEPENDENCY "find_dependency (gflags ${gflags_VERSION})") |
| 36 | @@ -554,7 +559,7 @@ |
| 37 | |
| 38 | configure_package_config_file (glog-config.cmake.in |
| 39 | ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake |
| 40 | - INSTALL_DESTINATION lib/cmake/glog |
| 41 | + INSTALL_DESTINATION ${_glog_CMake_INSTALLDIR} |
| 42 | NO_CHECK_REQUIRED_COMPONENTS_MACRO) |
| 43 | |
| 44 | write_basic_package_version_file (glog-config-version.cmake VERSION |
| 45 | @@ -567,6 +572,7 @@ |
| 46 | ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake |
| 47 | ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake |
| 48 | ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibunwind.cmake |
| 49 | - DESTINATION lib/cmake/glog) |
| 50 | + DESTINATION ${_glog_CMake_INSTALLDIR}) |
| 51 | |
| 52 | -install (EXPORT glog-targets NAMESPACE glog:: DESTINATION lib/cmake/glog) |
| 53 | +install (EXPORT glog-targets NAMESPACE glog:: DESTINATION |
| 54 | + ${_glog_CMake_INSTALLDIR}) |
| 55 | diff -uNr a/glog-config.cmake.in b/glog-config.cmake.in |
| 56 | --- a/glog-config.cmake.in 2018-12-05 12:55:59.630792054 +0100 |
| 57 | +++ b/glog-config.cmake.in 2018-12-05 13:05:19.547196843 +0100 |
| 58 | @@ -4,6 +4,7 @@ |
| 59 | |
| 60 | @gflags_DEPENDENCY@ |
| 61 | |
| 62 | +list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") |
| 63 | find_dependency (Libunwind) |
| 64 | |
| 65 | include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake") |