cvvergara
/
geos
forked from geos/geos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removing unnecessary stuff for C++11

compile-test-8.1
cvvergara 2018-08-17 22:02:24 -05:00
parent 1e66be587d
commit d2bc840dc2
Signed by: cvvergara
GPG Key ID: 2FD53808AB901869
2 changed files with 2 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CMakeLists.txt
View File

@ -202,34 +202,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

27
include/geos/platform.h.cmake
View File

@ -48,31 +48,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