[geos-commits] [SCM] GEOS branch master updated. c7c06b369a89ea1d7b45974d33ba10f8bb8e2123
git at osgeo.org
git at osgeo.org
Thu Dec 10 10:26:13 PST 2020
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 c7c06b369a89ea1d7b45974d33ba10f8bb8e2123 (commit)
from 22352f8927a6a4376ae06b4d94e6550d789259ef (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 c7c06b369a89ea1d7b45974d33ba10f8bb8e2123
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Dec 10 10:26:04 2020 -0800
Remove compile-time switches to disable OverlayNG, leaving the defines in place in case developers have a need to flip the switch
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60cb109..ac53e3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,39 +155,44 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11)
#-----------------------------------------------------------------------------
# Add flags to prevent 'fused multiply-add' operations on targets (ARM64)
-# that allow it, as it breaks calculations in DD.cpp.
+# that allow it, as it breaks calculations in DD.cpp.
# TODO: Replace DD calculations with 'long float' where target supports
# true long float, and remove other cases where FMA causes regression
# failures.
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98207
#-----------------------------------------------------------------------------
-target_compile_options(geos_cxx_flags INTERFACE
+target_compile_options(geos_cxx_flags INTERFACE
"$<$<CXX_COMPILER_ID:Clang>:-ffp-contract=off>"
"$<$<CXX_COMPILER_ID:GNU>:-ffp-contract=off>"
"$<$<CXX_COMPILER_ID:MSVC>:/fp:precise>"
)
-
+
#-----------------------------------------------------------------------------
# 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)
+ message(STATUS
+ "GEOS: Function inlining ENABLED")
else()
message(STATUS
- "GEOS: DISABLING inlining of small functions")
+ "GEOS: Function inlining DISABLED")
endif()
#-----------------------------------------------------------------------------
# Target geos_cxx_flags: overlayng code
#-----------------------------------------------------------------------------
-option(DISABLE_OVERLAYNG "Disable overlayng algorithms" OFF)
-if(DISABLE_OVERLAYNG)
- target_compile_definitions(geos_cxx_flags INTERFACE DISABLE_OVERLAYNG)
- message(STATUS
- "GEOS: DISABLING overlayng algorithms")
-endif()
+#option(DISABLE_OVERLAYNG "Disable overlayng algorithms" OFF)
+#if(DISABLE_OVERLAYNG)
+# target_compile_definitions(geos_cxx_flags INTERFACE DISABLE_OVERLAYNG)
+# message(STATUS
+# "GEOS: OverlayNG DISABLED")
+#else()
+# message(STATUS
+# "GEOS: OverlayNG ENABLED")
+#endif()
#-----------------------------------------------------------------------------
# Target geos_developer_cxx_flags: developer mode compilation flags
@@ -196,7 +201,7 @@ endif()
add_library(geos_developer_cxx_flags INTERFACE)
if(GEOS_BUILD_DEVELOPER)
- message(STATUS "GEOS: Developer mode enabled")
+ message(STATUS "GEOS: Developer mode ENABLED")
endif()
# geos_cxx_flags inherits properties from geos_developer_cxx_flags when
diff --git a/configure.ac b/configure.ac
index 9d0b772..1788345 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,22 +156,22 @@ fi
dnl --------------------------------------------------------------------
dnl - check whether user has requested overlayng
dnl --------------------------------------------------------------------
-
-AC_ARG_ENABLE([overlayng],
- [ --disable-overlayng Disable use of new overlay],
- [case "${enableval}" in
- yes) use_overlayng=true ;;
- no) use_overlayng=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --disable-overlayng) ;;
- esac],
- [use_overlayng=true]
-)
-
-if test x"$use_overlayng" = xtrue; then
- OVERLAYNG_FLAGS=""
-else
- OVERLAYNG_FLAGS="-DDISABLE_OVERLAYNG"
-fi
+dnl
+dnl AC_ARG_ENABLE([overlayng],
+dnl [ --disable-overlayng Disable use of new overlay],
+dnl [case "${enableval}" in
+dnl yes) use_overlayng=true ;;
+dnl no) use_overlayng=false ;;
+dnl *) AC_MSG_ERROR(bad value ${enableval} for --disable-overlayng) ;;
+dnl esac],
+dnl [use_overlayng=true]
+dnl )
+dnl
+dnl if test x"$use_overlayng" = xtrue; then
+dnl OVERLAYNG_FLAGS=""
+dnl else
+dnl OVERLAYNG_FLAGS="-DDISABLE_OVERLAYNG"
+dnl fi
dnl --------------------------------------------------------------------
dnl - Append default C++ and C flags
@@ -223,7 +223,7 @@ NUMERICFLAGS="$NUMERICFLAGS -ffp-contract=off"
dnl -----------------------------------------------------------------------------
HUSHWARNING="-DUSE_UNSTABLE_GEOS_CPP_API"
-DEFAULTFLAGS="${WARNFLAGS} ${NUMERICFLAGS} ${HUSHWARNING} ${OVERLAYNG_FLAGS}"
+DEFAULTFLAGS="${WARNFLAGS} ${NUMERICFLAGS} ${HUSHWARNING}"
AM_CXXFLAGS="${AM_CXXFLAGS} ${DEFAULTFLAGS}"
AM_CFLAGS="${AM_CFLAGS} ${DEFAULTFLAGS}"
@@ -283,17 +283,6 @@ dnl AM_CXXFLAGS="$AM_CXXFLAGS -Wnon-virtual-dtor -Woverloaded-virtual"
;;
esac
-dnl --------------------------------------------------------------------
-dnl - check for boost
-dnl --------------------------------------------------------------------
-
-dnl -- AX_BOOST(1.32)
-dnl -- if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then
-dnl -- use_boost_utf=yes
-dnl -- else
-dnl -- use_boost_utf=no
-dnl -- fi
-dnl -- AM_CONDITIONAL(ENABLE_BOOST_UTF, [test "x$use_boost_utf" = "xyes"])
dnl things to substitute in output ----------------------------------------
AC_SUBST(VERSION)
@@ -435,7 +424,9 @@ AC_OUTPUT([
tools/astyle/Makefile
])
-dnl -- echo "---------------------------------------"
-dnl -- echo "Boost UTF: $use_boost_utf"
-dnl -- echo "OverlayNG: $use_overlayng"
-dnl -- echo "---------------------------------------"
+dnl AC_MSG_RESULT([ ------------ GEOS Build ------------ ])
+dnl AC_MSG_RESULT([ Version: ${VERSION}])
+dnl AC_MSG_RESULT([ Inlining: ${enable_inline}])
+dnl AC_MSG_RESULT([ ------------------------------------ ])
+
+
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 27 ++++++++++++++++-----------
configure.ac | 55 +++++++++++++++++++++++--------------------------------
2 files changed, 39 insertions(+), 43 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list