Use GNUInstallDirs

Author: larshg

CMakeLists.txt

@@ -246,6 +246,7 @@ if(WIN32)
   set(PCL_POINTCLOUDS_DIR "${PCL_RESOURCES_DIR}/pointclouds")
 endif()
 
+#Set up output directory for builds
 set(PCL_OUTPUT_LIB_DIR "${PCL_BINARY_DIR}/${LIB_INSTALL_DIR}")
 set(PCL_OUTPUT_BIN_DIR "${PCL_BINARY_DIR}/${BIN_INSTALL_DIR}")
 make_directory("${PCL_OUTPUT_LIB_DIR}")
@@ -274,6 +275,7 @@ if(CMAKE_GENERATOR_IS_IDE)
 else()
   set(UNINSTALL_TARGET_NAME uninstall)
 endif()
+
 configure_file("${PCL_SOURCE_DIR}/cmake/uninstall_target.cmake.in"
                "${PCL_BINARY_DIR}/uninstall_target.cmake" IMMEDIATE @ONLY)
 add_custom_target(${UNINSTALL_TARGET_NAME} "${CMAKE_COMMAND}" -P

cmake/pcl_pclconfig.cmake

@@ -93,10 +93,6 @@ if(Boost_SERIALIZATION_FOUND)
   string(APPEND PCLCONFIG_AVAILABLE_BOOST_MODULES " serialization")
 endif()
 
-include(GNUInstallDirs)
-set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/pcl
-    CACHE PATH "Location of header files" )
-
 include(CMakePackageConfigHelpers)
 
 configure_package_config_file(PCLConfig.cmake.in

cmake/pcl_targets.cmake

@@ -243,7 +243,7 @@ function(PCL_ADD_LIBRARY _name)
     EXPORT ${_name}Targets
     NAMESPACE pcl::
     FILE ${_name}.cmake
-    DESTINATION ${LIB_INSTALL_DIR}/cmake
+    DESTINATION ${PCLCONFIG_INSTALL_DIR}
   )
 
   # Copy PDB if available

cmake/pcl_utils.cmake

@@ -91,20 +91,44 @@ endmacro()
 # subdirectory named after the library in question (e.g.
 # "registration/blorgle.h")
 macro(SET_INSTALL_DIRS)
+  include(GNUInstallDirs)
+
   if(NOT DEFINED LIB_INSTALL_DIR)
-    set(LIB_INSTALL_DIR "lib")
+    set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
+  endif()
+
+  if(NOT ANDROID)
+    set(INCLUDE_INSTALL_ROOT
+        "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
+  else()
+    set(INCLUDE_INSTALL_ROOT ${CMAKE_INSTALL_INCLUDEDIR}) # Android, don't put into subdir
+  endif()
+
+  if(NOT DEFINED INCLUDE_INSTALL_DIR)
+    set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl")
+  endif()
+
+  if(NOT DEFINED DOC_INSTALL_DIR)
+    set(DOC_INSTALL_DIR "${CMAKE_INSTALL_DOCDIR}")
   endif()
-    if(NOT ANDROID)
-      set(INCLUDE_INSTALL_ROOT
-          "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
+
+  if(NOT DEFINED BIN_INSTALL_DIR)
+    set(BIN_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
+  endif()
+
+  if(NOT DEFINED PKGCFG_INSTALL_DIR)
+    set(PKGCFG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+  endif()
+
+  if(NOT DEFINED PCLCONFIG_INSTALL_DIR)
+    if(WIN32 AND NOT MINGW)
+     set(PCLCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake")
     else()
-      set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
+      # Most distributions install cmake config files in /usr/lib*/cmake
+      # and not in /usr/share/cmake.
+      set(PCLCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
     endif()
-    set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl")
-    set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
-    set(BIN_INSTALL_DIR "bin")
-    set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig")
-    set(PCLCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake")
+  endif()
 endmacro()