[geos-commits] [SCM] GEOS branch master updated. 9ed254c129428b12228fcb9e09f9bd87cf0f3b29
git at osgeo.org
git at osgeo.org
Sun Aug 19 05:00:30 PDT 2018
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 9ed254c129428b12228fcb9e09f9bd87cf0f3b29 (commit)
from 75c643623d9944a87a3c27ec3e698cbbb550cd0e (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 9ed254c129428b12228fcb9e09f9bd87cf0f3b29
Author: Regina Obe <lr at pcorp.us>
Date: Sun Aug 19 08:00:24 2018 -0400
Apply Vicky's remove unnecessary cmake stuff no longer needed for c+11
Closes #914 for GEOS 3.8
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc3102a..1b1f47b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,35 +201,6 @@ else()
endif()
endif()
-# check functions and macros
-include(CheckPrototypeExists)
-include(CheckSymbolExists)
-
-check_prototype_exists(isnan cmath HAVE_STD_ISNAN)
-if(NOT HAVE_STD_ISNAN)
- if(MSVC)
- check_prototype_exists(_isnan float.h HAVE_ISNAN)
- elseif(APPLE)
- check_prototype_exists(__isnand math.h HAVE_ISNAND_XCODE)
- if(NOT HAVE_ISNAND_XCODE)
- check_prototype_exists(__inline_isnand math.h HAVE_INLINE_ISNAND_XCODE)
- endif()
- else()
- check_symbol_exists(isnan math.h HAVE_ISNAN)
- endif()
-endif()
-
-check_prototype_exists(isfinite cmath HAVE_STD_ISFINITE)
-
-if(NOT HAVE_STD_ISFINITE)
- if(MSVC)
- check_prototype_exists(_finite float.h HAVE_FINITE)
- else()
- #CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
- check_symbol_exists(isfinite math.h HAVE_ISFINITE)
- endif()
-endif()
-
################################################################################
# Setup build directories
#################################################################################
diff --git a/include/geos/platform.h.cmake b/include/geos/platform.h.cmake
index 9640966..c6330bf 100644
--- a/include/geos/platform.h.cmake
+++ b/include/geos/platform.h.cmake
@@ -47,33 +47,8 @@
typedef int64_t int64;
-
-#if defined(_MSC_VER) && _MSC_VER >= 1200 // VC++ 6.0 and above
-# include <float.h>
-# ifndef FINITE
-# define FINITE(x) _finite(x)
-# endif
-# ifndef ISNAN
-# define ISNAN(x) _isnan(x)
-# endif
-#elif !defined(HAVE_IEEEFP_H)
-# include <cmath>
-# ifndef FINITE
-# define FINITE(x) std::isfinite(x)
-# endif
-# ifndef ISNAN
-# define ISNAN(x) std::isnan(x)
-# endif
-#else
-# include <ieeefp.h>
-# ifndef FINITE
-# define FINITE(x) finite(x)
-# endif
-# ifndef ISNAN
-# define ISNAN(x) isnan(x)
-# endif
-#endif
-
+#define ISNAN(x) std::isnan(x)
+#define FINITE(x) std::isfinite(x)
// Some handy constants
constexpr double DoubleNotANumber = std::numeric_limits<double>::quiet_NaN();
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 29 -----------------------------
include/geos/platform.h.cmake | 29 ++---------------------------
2 files changed, 2 insertions(+), 56 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list