[geos-commits] [SCM] GEOS branch master updated. 3db733ddd1b6c4c407561023291cd648741ea79d

[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  3db733ddd1b6c4c407561023291cd648741ea79d (commit)
       via  195dba53b722ed250715f7690c6cafc69627e311 (commit)
      from  1e66be587d92ac281d85598a2f6c79c22e912a20 (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 3db733ddd1b6c4c407561023291cd648741ea79d
Merge: 195dba5 1e66be5
Author: Regina Obe <lr at pcorp.us>
Date:   Fri Aug 17 22:52:49 2018 -0400

    Merge branch 'master' of https://git.osgeo.org/gitea/geos/geos


commit 195dba53b722ed250715f7690c6cafc69627e311
Author: Regina Obe <lr at pcorp.us>
Date:   Fri Aug 17 22:52:34 2018 -0400

    Take out the C++11 enforcement causing issue with finite - see #914. Also take out dev from pathc, its already in there

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45a1a45..6bfe075 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,9 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
 #################################################################################
 # Set C++ standard
 #################################################################################
-set(CMAKE_CXX_STANDARD 11)
+##remarking out the CMAKE_CXX_STANDARD 11 for now cause mingw64 gcc 8.1 doesn't like it
+## see ticket https://trac.osgeo.org/geos/ticket/914
+#set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -43,7 +45,6 @@ message(STATUS "Setting C++ requirement to C++${CMAKE_CXX_STANDARD}")
 
 # GEOS release version
 # GEOS C++ library SONAME will use these encoding ABI break at every release
-set(GEOS_VERSION_PATCH "${GEOS_VERSION_PATCH}dev")
 set(GEOS_VERSION "${GEOS_VERSION_MAJOR}.${GEOS_VERSION_MINOR}.${GEOS_VERSION_PATCH}")
 set(VERSION "${GEOS_VERSION}")
 

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

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


hooks/post-receive
-- 
GEOS