[geos-commits] [SCM] GEOS branch master updated. 5cee9d81d8b0408c5b861926aeac7f1faf1f97d1

[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  5cee9d81d8b0408c5b861926aeac7f1faf1f97d1 (commit)
      from  3de83a94332cdcbc3b1a23a37a81f2c05eea34c2 (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 5cee9d81d8b0408c5b861926aeac7f1faf1f97d1
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Dec 21 11:22:26 2018 -0800

    Remove ttmath ASM on Windows/MinGW for now to see if we
    can get MinGW builds at all

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb70640..7e7e731 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,6 +168,11 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
   # Enable glibc ISO C99 features (macros isfinite, isnan)
   set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_ISOC99_SOURCE=1")
 
+  # For now, punt on ASM on Windows/MinGW
+  if(MINGW)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTTMATH_NOASM")
+  endif()
+
 elseif(MSVC)
 
   # Set pedantic mode by default

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

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


hooks/post-receive
-- 
GEOS