[geos-commits] [SCM] GEOS branch master updated. a87d8b9bedb862fe8701e5cc85ff2f8bec06f56d

[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  a87d8b9bedb862fe8701e5cc85ff2f8bec06f56d (commit)
       via  e8404cc61a3fc5174fcea9faaafda15da831bab0 (commit)
      from  b679eca65dc9fa0ffa1a80fb3fd00bbfce466edd (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 a87d8b9bedb862fe8701e5cc85ff2f8bec06f56d
Merge: b679eca e8404cc
Author: Daniel Baston <dbaston at gmail.com>
Date:   Sun Dec 15 21:07:02 2019 -0500

    Merge remote-tracking branch 'gergondet/topic/InstallInlFiles'


commit e8404cc61a3fc5174fcea9faaafda15da831bab0
Author: Pierre Gergondet <pierre.gergondet at gmail.com>
Date:   Fri Dec 13 15:43:22 2019 +0800

    Install inl files if DISABLE_GEOS_INLINE is OFF

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c893fea..b78ca54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -309,6 +309,13 @@ install(DIRECTORY
   "${CMAKE_CURRENT_BINARY_DIR}/include/geos"
   DESTINATION include
   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
+    FILES_MATCHING PATTERN "*.inl")
+endif()
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/capi/geos_c.h"
   DESTINATION include)
 
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index df8cd4d..0456baa 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -8,7 +8,11 @@
 # by the Free Software Foundation.
 # See the COPYING file for more information.
 ################################################################################
-file(GLOB_RECURSE _headers ${CMAKE_CURRENT_LIST_DIR}/*.h  CONFIGURE_DEPEND)
+if(DISABLE_GEOS_INLINE)
+  file(GLOB_RECURSE _headers ${CMAKE_CURRENT_LIST_DIR}/*.h  CONFIGURE_DEPEND)
+else()
+  file(GLOB_RECURSE _headers ${CMAKE_CURRENT_LIST_DIR}/*.h  ${CMAKE_CURRENT_LIST_DIR}/*.inl CONFIGURE_DEPEND)
+endif()
 target_sources(geos PRIVATE ${_headers})
 unset(_headers)
 

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

Summary of changes:
 CMakeLists.txt         | 7 +++++++
 include/CMakeLists.txt | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GEOS