[geos-commits] [SCM] GEOS branch master updated. a02b19491b995e94c6c4aeeea8a32b5a020d34d8

[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  a02b19491b995e94c6c4aeeea8a32b5a020d34d8 (commit)
      from  e706f1cdbdb7df052a1e1a1557adcb17008b51ea (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 a02b19491b995e94c6c4aeeea8a32b5a020d34d8
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Dec 21 13:07:14 2018 -0800

    Attempt to catch all gcc/windows = mingw cases in one net

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 485ff8e..89b0a72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,8 +168,8 @@ 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)
+  # For now, punt on ASM on Windows/MinGW/GCC
+  if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTTMATH_NOASM")
     message(STATUS "Setting TTMATH_NOASM")
   endif()

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

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


hooks/post-receive
-- 
GEOS