Use GNUInstallDirs to set installation locations

The use of GNUInstallDirs ensures, the files are installed in common locations on all platforms. Closes: PointCloudLibrary#5496 Signed-off-by: Bernd Waibel <[email protected]>
waebbl · Oct 28, 2022 · af54dcc · af54dcc
1 parent 0cbaf1e
commit af54dcc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
@@ -390,8 +390,8 @@ if(WIN32 AND NOT MINGW)
     set(PCL_ALL_IN_ONE_INSTALLER ON)
   endif()
 else()
-# PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
-  get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
+# PCLConfig.cmake is installed to PCL_ROOT/lib*/cmake/pcl-x.y
+  get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE)
 endif()
 
 # check whether PCLConfig.cmake is found into a PCL installation or in a build tree

diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
@@ -85,30 +85,40 @@ endmacro()
 
 ###############################################################################
 # Set the destination directories for installing stuff.
+# We use GNUInstallDirs for this, to ensure platform indepence.
 # Sets LIB_INSTALL_DIR. Install libraries here.
 # Sets BIN_INSTALL_DIR. Install binaries here.
 # Sets INCLUDE_INSTALL_DIR. Install include files here, preferably in a
 # subdirectory named after the library in question (e.g.
 # "registration/blorgle.h")
+include(GNUInstallDirs)
 macro(SET_INSTALL_DIRS)
   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
-          "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
+  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()
+  set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl")
+  if(NOT DEFINED DOC_INSTALL_DIR)
+    set(DOC_INSTALL_DIR "${CMAKE_INSTALL_DOCDIR}")
+  endif()
+  if(NOT DEFINED BIN_INSTALL_DIR)
+    set(BIN_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
+  endif()
+  set(PKGCFG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+  if(NOT DEFINED PCLCONFIG_INSTALL_DIR)
+    if(WIN32 AND NOT MINGW)
+      set(PCLCONFIG_INSTALL_DIR "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")
-    if(WIN32 AND NOT MINGW)
-        set(PCLCONFIG_INSTALL_DIR "cmake")
-      else()
-        set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
-      endif()
+  endif()
 endmacro()