[geos-commits] [SCM] GEOS branch master updated. 39ce10ea7fb7891b6c4f5a241c83a8dc46f8a1c7

[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  39ce10ea7fb7891b6c4f5a241c83a8dc46f8a1c7 (commit)
      from  e5d9a6893d92c89b850b13328bbbaea4ac6fb311 (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 39ce10ea7fb7891b6c4f5a241c83a8dc46f8a1c7
Author: Regina Obe <lr at pcorp.us>
Date:   Fri May 24 17:50:06 2019 -0400

    Put back DISABLE_GEOS_INLINE and take out GEOS_ENABLE_INLINE.  Has clearer meaning though a breaking change. References #970

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 388ffbf..2dfc81d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,14 +142,14 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11)
 #-----------------------------------------------------------------------------
 # Target geos_cxx_flags: common compilation flags
 #-----------------------------------------------------------------------------
-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)
+option(DISABLE_GEOS_INLINE "Disable inlining" OFF)
+if(NOT DISABLE_GEOS_INLINE)
+  target_compile_definitions(geos_cxx_flags INTERFACE GEOS_INLINE)
+else()
+  message(STATUS
+  "Setting DISABLE GEOS compilation with small functions inlining - ${DISABLE_GEOS_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 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GEOS