Commit b3dea50f authored by Sergiu Deitsch's avatar Sergiu Deitsch

cmake: do not hardcode relative install directories

parent b6a5e052
...@@ -45,6 +45,7 @@ include (CMakePackageConfigHelpers) ...@@ -45,6 +45,7 @@ include (CMakePackageConfigHelpers)
include (CPack) include (CPack)
include (CTest) include (CTest)
include (DetermineGflagsNamespace) include (DetermineGflagsNamespace)
include (GNUInstallDirs)
set (CMAKE_THREAD_PREFER_PTHREAD 1) set (CMAKE_THREAD_PREFER_PTHREAD 1)
...@@ -415,10 +416,15 @@ endif (WIN32) ...@@ -415,10 +416,15 @@ endif (WIN32)
set_target_properties (glog PROPERTIES PUBLIC_HEADER "${GLOG_PUBLIC_H}") set_target_properties (glog PROPERTIES PUBLIC_HEADER "${GLOG_PUBLIC_H}")
set (_glog_CMake_BINDIR ${CMAKE_INSTALL_BINDIR})
set (_glog_CMake_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
set (_glog_CMake_LIBDIR ${CMAKE_INSTALL_LIBDIR})
set (_glog_CMake_INSTALLDIR ${_glog_CMake_LIBDIR}/cmake/glog)
target_include_directories (glog BEFORE PUBLIC target_include_directories (glog BEFORE PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
"$<INSTALL_INTERFACE:include>" "$<INSTALL_INTERFACE:${_glog_CMake_INCLUDE_DIR}>"
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
...@@ -555,10 +561,10 @@ endif (BUILD_TESTING) ...@@ -555,10 +561,10 @@ endif (BUILD_TESTING)
install (TARGETS glog install (TARGETS glog
EXPORT glog-targets EXPORT glog-targets
RUNTIME DESTINATION bin RUNTIME DESTINATION ${_glog_CMake_BINDIR}
PUBLIC_HEADER DESTINATION include/glog PUBLIC_HEADER DESTINATION ${_glog_CMake_INCLUDE_DIR}/glog
LIBRARY DESTINATION lib LIBRARY DESTINATION ${_glog_CMake_LIBDIR}
ARCHIVE DESTINATION lib) ARCHIVE DESTINATION ${_glog_CMake_LIBDIR})
if (gflags_FOUND) if (gflags_FOUND)
set (gflags_DEPENDENCY "find_dependency (gflags ${gflags_VERSION})") set (gflags_DEPENDENCY "find_dependency (gflags ${gflags_VERSION})")
...@@ -566,7 +572,7 @@ endif (gflags_FOUND) ...@@ -566,7 +572,7 @@ endif (gflags_FOUND)
configure_package_config_file (glog-config.cmake.in configure_package_config_file (glog-config.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake
INSTALL_DESTINATION lib/cmake/glog INSTALL_DESTINATION ${_glog_CMake_INSTALLDIR}
NO_CHECK_REQUIRED_COMPONENTS_MACRO) NO_CHECK_REQUIRED_COMPONENTS_MACRO)
write_basic_package_version_file (glog-config-version.cmake VERSION write_basic_package_version_file (glog-config-version.cmake VERSION
...@@ -578,6 +584,7 @@ export (PACKAGE glog) ...@@ -578,6 +584,7 @@ export (PACKAGE glog)
install (FILES install (FILES
${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake
${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake
DESTINATION lib/cmake/glog) DESTINATION ${_glog_CMake_INSTALLDIR})
install (EXPORT glog-targets NAMESPACE glog:: DESTINATION lib/cmake/glog) install (EXPORT glog-targets NAMESPACE glog:: DESTINATION
${_glog_CMake_INSTALLDIR})
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