CXX-1540 Use GNUInstallDirs to allow finer control over installation

Author: acmorrow

CMakeLists.txt

@@ -80,6 +80,8 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set (CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "default install path" FORCE)
 endif()
 
+include(GNUInstallDirs)
+
 if(NOT CMAKE_BUILD_TYPE)
     message(STATUS "No build type selected, default is Release")
     set(CMAKE_BUILD_TYPE "Release")

benchmark/CMakeLists.txt

@@ -54,4 +54,4 @@ set(BENCHMARK_LIBRARY
 add_executable(microbenchmarks ${BENCHMARK_LIBRARY})
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
-target_link_libraries(microbenchmarks mongocxx bsoncxx Threads::Threads)
+target_link_libraries(microbenchmarks mongocxx bsoncxx Threads::Threads)

benchmark/score_recorder.cpp

@@ -14,6 +14,9 @@
 
 #include "score_recorder.hpp"
 
+#include <algorithm>
+#include <stdexcept>
+
 namespace benchmark {
 
 score_recorder::score_recorder(double task_size)
@@ -58,4 +61,4 @@ const std::chrono::milliseconds& score_recorder::get_percentile(unsigned long n)
 double score_recorder::get_score() {
     return _task_size / (static_cast<double>(get_percentile(50).count()) * .001);
 }
-}  // namespace benchmark
+}  // namespace benchmark

src/bsoncxx/CMakeLists.txt

@@ -72,7 +72,7 @@ endif()
 set(BSONCXX_VERSION_NO_EXTRA ${BSONCXX_VERSION_MAJOR}.${BSONCXX_VERSION_MINOR}.${BSONCXX_VERSION_PATCH})
 set(BSONCXX_VERSION ${BSONCXX_VERSION_NO_EXTRA}${BSONCXX_VERSION_EXTRA})
 set(BSONCXX_INLINE_NAMESPACE "v${BSONCXX_ABI_VERSION}")
-set(BSONCXX_HEADER_INSTALL_DIR "include/bsoncxx/${BSONCXX_INLINE_NAMESPACE}" CACHE INTERNAL "")
+set(BSONCXX_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/bsoncxx/${BSONCXX_INLINE_NAMESPACE}" CACHE INTERNAL "")
 
 set(LIBBSON_REQUIRED_VERSION 1.9.2)
 set(LIBBSON_REQUIRED_ABI_VERSION 1.0)
@@ -215,13 +215,13 @@ install(FILES
 
 install(TARGETS
     bsoncxx
-    RUNTIME DESTINATION bin COMPONENT runtime
-    LIBRARY DESTINATION lib COMPONENT runtime
-    ARCHIVE DESTINATION lib COMPONENT dev
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev
 )
 
 set(PACKAGE_INCLUDE_INSTALL_DIRS ${BSONCXX_HEADER_INSTALL_DIR})
-set(PACKAGE_LIBRARY_INSTALL_DIRS lib)
+set(PACKAGE_LIBRARY_INSTALL_DIRS ${CMAKE_INSTALL_LIBDIR})
 set(PACKAGE_LIBRARIES bsoncxx)
 
 include(CMakePackageConfigHelpers)
@@ -234,7 +234,7 @@ endif()
 
 configure_package_config_file(
   cmake/${PKG}-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PKG}-config.cmake
-  INSTALL_DESTINATION lib/cmake/${PKG}-${BSONCXX_VERSION}
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PKG}-${BSONCXX_VERSION}
   PATH_VARS PACKAGE_INCLUDE_INSTALL_DIRS PACKAGE_LIBRARY_INSTALL_DIRS
 )
 
@@ -246,7 +246,7 @@ write_basic_package_version_file(
 
 install(
   FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKG}-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PKG}-config-version.cmake
-  DESTINATION lib/cmake/${PKG}-${BSONCXX_VERSION}
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PKG}-${BSONCXX_VERSION}
 )
 
 add_subdirectory(test)

src/bsoncxx/config/CMakeLists.txt

@@ -43,7 +43,7 @@ if (BUILD_SHARED_LIBS)
 
     install(FILES
         "${CMAKE_CURRENT_BINARY_DIR}/libbsoncxx.pc"
-        DESTINATION lib/pkgconfig
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
         COMPONENT dev
     )
 else()
@@ -55,7 +55,7 @@ else()
 
     install(FILES
         "${CMAKE_CURRENT_BINARY_DIR}/libbsoncxx-static.pc"
-        DESTINATION lib/pkgconfig
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
         COMPONENT dev
     )
 endif()

src/mongocxx/CMakeLists.txt

@@ -28,7 +28,7 @@ option(MONGOCXX_ENABLE_SLOW_TESTS "Run slow tests when invoking the the test tar
 set(MONGOCXX_VERSION_NO_EXTRA ${MONGOCXX_VERSION_MAJOR}.${MONGOCXX_VERSION_MINOR}.${MONGOCXX_VERSION_PATCH})
 set(MONGOCXX_VERSION ${MONGOCXX_VERSION_NO_EXTRA}${MONGOCXX_VERSION_EXTRA})
 set(MONGOCXX_INLINE_NAMESPACE "v${MONGOCXX_ABI_VERSION}")
-set(MONGOCXX_HEADER_INSTALL_DIR "include/mongocxx/${MONGOCXX_INLINE_NAMESPACE}" CACHE INTERNAL "")
+set(MONGOCXX_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/mongocxx/${MONGOCXX_INLINE_NAMESPACE}" CACHE INTERNAL "")
 
 set(LIBMONGOC_REQUIRED_VERSION 1.9.2)
 set(LIBMONGOC_REQUIRED_ABI_VERSION 1.0)
@@ -206,13 +206,13 @@ install(FILES
 
 install(TARGETS
     mongocxx
-    RUNTIME DESTINATION bin COMPONENT runtime
-    LIBRARY DESTINATION lib COMPONENT runtime
-    ARCHIVE DESTINATION lib COMPONENT dev
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev
 )
 
 set(PACKAGE_INCLUDE_INSTALL_DIRS ${MONGOCXX_HEADER_INSTALL_DIR})
-set(PACKAGE_LIBRARY_INSTALL_DIRS lib)
+set(PACKAGE_LIBRARY_INSTALL_DIRS ${CMAKE_INSTALL_LIBDIR})
 set(PACKAGE_LIBRARIES mongocxx)
 
 include(CMakePackageConfigHelpers)
@@ -225,7 +225,7 @@ endif()
 
 configure_package_config_file(
   cmake/${PKG}-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PKG}-config.cmake
-  INSTALL_DESTINATION lib/cmake/${PKG}-${MONGOCXX_VERSION}
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PKG}-${MONGOCXX_VERSION}
   PATH_VARS PACKAGE_INCLUDE_INSTALL_DIRS PACKAGE_LIBRARY_INSTALL_DIRS
 )
 
@@ -237,7 +237,7 @@ write_basic_package_version_file(
 
 install(
   FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKG}-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PKG}-config-version.cmake
-  DESTINATION lib/cmake/${PKG}-${MONGOCXX_VERSION}
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PKG}-${MONGOCXX_VERSION}
 )
 
 add_subdirectory(test)

src/mongocxx/config/CMakeLists.txt

@@ -43,7 +43,7 @@ if (BUILD_SHARED_LIBS)
 
     install(FILES
         "${CMAKE_CURRENT_BINARY_DIR}/libmongocxx.pc"
-        DESTINATION lib/pkgconfig
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
         COMPONENT dev
     )
 else()
@@ -55,7 +55,7 @@ else()
 
     install(FILES
         "${CMAKE_CURRENT_BINARY_DIR}/libmongocxx-static.pc"
-        DESTINATION lib/pkgconfig
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
         COMPONENT dev
     )
 endif()