[geos-commits] [SCM] geos branch master updated. d43e678578cfc60d02fbb051319d65e638474515

[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  d43e678578cfc60d02fbb051319d65e638474515 (commit)
       via  62380be288dc5cd2e6b5e8afc69e7b9e716546dc (commit)
       via  ed57b476690b07f1e8b51b015ec35ac6970aac7e (commit)
      from  e99ed9d1996b6fd491a6462c54dfc83cacb5a997 (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 d43e678578cfc60d02fbb051319d65e638474515
Author: cvvergara <vicky at georepublic.de>
Date:   Tue Jan 9 00:59:55 2018 -0600

    cmake: improving handling version

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df91af3..1944c80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,10 +17,13 @@ if(NOT CMAKE_VERSION)
       "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
 endif()
 
+if(POLICY CMP0048)
+    cmake_policy(SET CMP0048 NEW)
+endif()
 #################################################################################
 # Set GEOS project
 #################################################################################
-project(GEOS LANGUAGES C CXX)
+project(GEOS VERSION 3.7.0 LANGUAGES C CXX)
 
 # Add custom GEOS modules for CMake
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
@@ -40,10 +43,9 @@ 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(VERSION_MAJOR 3)
-set(VERSION_MINOR 7)
-set(VERSION_PATCH 0dev)
-set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+set(GEOS_VERSION_PATCH "${GEOS_VERSION_PATCH}dev")
+set(GEOS_VERSION "${GEOS_VERSION_MAJOR}.${GEOS_VERSION_MINOR}.${GEOS_VERSION_PATCH}")
+set(VERSION "${GEOS_VERSION}")
 
 # JTS_PORT is the version of JTS this release is bound to
 set(JTS_PORT 1.13.0)
diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index 751b80d..2deae01 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -36,7 +36,8 @@
       - VERSION_MAJOR for SUBSTANTIAL additions or C lib ABI break
         [ THIS MUST BE CAREFULLY AVOIDED ]
     - In main CMakeLists.txt main one
-       - VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH
+       - CHANGE the line: project(GEOS VERSION <mayor>.<minor>.<micro> LANGUAGES C CXX)
+       - CHANGE the line: set(GEOS_VERSION_PATCH "${GEOS_VERSION_PATCH}dev")
        - CAPI_INTERFACE_*
 
 12. Update wiki page https://trac.osgeo.org/geos/ at Download section

commit 62380be288dc5cd2e6b5e8afc69e7b9e716546dc
Author: cvvergara <vicky at georepublic.de>
Date:   Tue Jan 9 01:33:23 2018 -0600

    getting stricter with warnings

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a8f7d9..df91af3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,10 +129,10 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
     "Forcing IEEE 754 using flag -ffloat-store - ${GEOS_ENABLE_FLOATSTORE}")
 
   # Warnings specification
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -fno-implicit-inline-templates -Wconversion -pedantic -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
 
   # Turn on Position Independent Code generation for GEOS C shared library
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -Wall -Wconversion -pedantic -Wmissing-prototypes -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
 
   # Enable glibc ISO C99 features (macros isfinite, isnan)
   set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_ISOC99_SOURCE=1")

commit ed57b476690b07f1e8b51b015ec35ac6970aac7e
Author: cvvergara <vicky at georepublic.de>
Date:   Tue Jan 9 01:17:05 2018 -0600

    removing -ansi and fPIC from C++ compilation

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a5b2d4..1a8f7d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ endif()
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
 
   # General options
-  set(CMAKE_CXX_FLAGS "-pedantic -ansi ${CMAKE_CXX_FLAGS}")
+  set(CMAKE_C_FLAGS "-pedantic -ansi ${CMAKE_C_FLAGS}")
 
   # Numerical stability
   if(GEOS_ENABLE_FLOATSTORE)
@@ -132,7 +132,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long")
 
   # Turn on Position Independent Code generation for GEOS C shared library
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
 
   # Enable glibc ISO C99 features (macros isfinite, isnan)
   set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_ISOC99_SOURCE=1")

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

Summary of changes:
 CMakeLists.txt |   18 ++++++++++--------
 HOWTO_RELEASE  |    3 ++-
 2 files changed, 12 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
geos