[geos-commits] [SCM] GEOS branch master updated. 1fb11b298d4890afb6a86cdf3325b1272a5def1c

[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  1fb11b298d4890afb6a86cdf3325b1272a5def1c (commit)
      from  6e0f7cccbad61cf46dc844fb213f50335d26ac3a (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 1fb11b298d4890afb6a86cdf3325b1272a5def1c
Author: Regina Obe <lr at pcorp.us>
Date:   Wed May 22 20:00:56 2019 -0400

    Put back cmake GEOS_ENABLE_INLINE and get rid of DISABLE_GEOS_INLINE introduced in 9ed254c129428b12228fcb9e09f9bd87cf0f3b29

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef73da9..e31590a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,11 +130,14 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11)
 #-----------------------------------------------------------------------------
 # Target geos_cxx_flags: common compilation flags
 #-----------------------------------------------------------------------------
-option(DISABLE_GEOS_INLINE "Disable inlining" OFF)
-if(NOT DISABLE_GEOS_INLINE)
-  target_compile_definitions(geos_cxx_flags INTERFACE GEOS_INLINE)
+option(GEOS_ENABLE_INLINE "Set to OFF|ON (default) to control GEOS compilation with small functions inlining" ON)
+if(GEOS_ENABLE_INLINE)
+  add_definitions(-DGEOS_INLINE)
 endif()
 
+message(STATUS
+  "Setting GEOS compilation with small functions inlining - ${GEOS_ENABLE_INLINE}")
+
 #-----------------------------------------------------------------------------
 # Target geos_developer_cxx_flags: developer mode compilation flags
 #-----------------------------------------------------------------------------

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

Summary of changes:
 CMakeLists.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GEOS