[geos-commits] [SCM] GEOS branch master updated. 4f5e533f138d44e0b2c7a628645cf8e2a6907bf4

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  4f5e533f138d44e0b2c7a628645cf8e2a6907bf4 (commit)
       via  9e156d27169832646be2cf886d0a6c24bd59bbb5 (commit)
      from  1de2189ed107a33a795dd7cd5aa8e014ef870f75 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f5e533f138d44e0b2c7a628645cf8e2a6907bf4
Merge: 1de2189 9e156d2
Author: Daniel Baston <dbaston at gmail.com>
Date:   Fri Jan 22 19:22:46 2021 -0500

    Merge branch 'cmake-gnu-installdirs'


commit 9e156d27169832646be2cf886d0a6c24bd59bbb5
Author: Daniel Baston <dbaston at gmail.com>
Date:   Sat Jan 9 20:27:29 2021 -0500

    CMake: Use GNUInstallDirs to set install directories

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89b05ec..5b088a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -298,6 +298,7 @@ add_subdirectory(doc)
 # Install and export targets - support 'make install' or equivalent
 #-----------------------------------------------------------------------------
 include(CMakePackageConfigHelpers)
+include(GNUInstallDirs)
 
 write_basic_package_version_file(
   "${CMAKE_CURRENT_BINARY_DIR}/geos-config-version.cmake"
@@ -310,43 +311,43 @@ configure_file(cmake/geos-config.cmake
 
 install(TARGETS geos geos_cxx_flags
   EXPORT geos-targets
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
   )
 
 install(TARGETS geos_c
   EXPORT geos-targets
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
   )
 
 install(EXPORT geos-targets
   FILE geos-targets.cmake
   NAMESPACE GEOS::
-  DESTINATION lib/cmake/GEOS)
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/GEOS)
 
 install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/geos-config.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/geos-config-version.cmake"
-  DESTINATION lib/cmake/GEOS)
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/GEOS)
 install(DIRECTORY
   "${CMAKE_CURRENT_LIST_DIR}/include/geos"
   "${CMAKE_CURRENT_BINARY_DIR}/include/geos"
-  DESTINATION include
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
   FILES_MATCHING PATTERN "*.h")
 if(NOT DISABLE_GEOS_INLINE)
   install(DIRECTORY
     "${CMAKE_CURRENT_LIST_DIR}/include/geos"
     "${CMAKE_CURRENT_BINARY_DIR}/include/geos"
-    DESTINATION include
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.inl")
 endif()
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/capi/geos_c.h"
-  DESTINATION include)
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 add_subdirectory(tools)
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index f0f616e..5cfa885 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -22,7 +22,7 @@ if(NOT MSVC)
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/geos-config
-    DESTINATION bin
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
     PERMISSIONS
       OWNER_READ OWNER_EXECUTE
       GROUP_READ GROUP_EXECUTE
@@ -36,7 +36,7 @@ if(NOT MSVC)
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/geos.pc
-    DESTINATION lib/pkgconfig)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 endif()
 

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt       | 27 ++++++++++++++-------------
 tools/CMakeLists.txt |  4 ++--
 2 files changed, 16 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GEOS