From: maier Date: Wed, 12 Sep 2012 16:11:36 +0000 (+0000) Subject: Some further checks in check_for_cxx_features.cmake X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68e95b275d489086b81bbbae55519168abebc95a;p=dealii-svn.git Some further checks in check_for_cxx_features.cmake git-svn-id: https://svn.dealii.org/branches/branch_cmake@26317 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/cmake/check/check_for_cxx_features.cmake b/deal.II/contrib/cmake/check/check_for_cxx_features.cmake index b4fe1a6c1c..dabdf2ba30 100644 --- a/deal.II/contrib/cmake/check/check_for_cxx_features.cmake +++ b/deal.II/contrib/cmake/check/check_for_cxx_features.cmake @@ -195,8 +195,31 @@ LIST(REMOVE_ITEM CMAKE_REQUIRED_FLAGS "-std=c++0x") +CHECK_CXX_SOURCE_COMPILES( + " + #include + int main(){ double d=0; isnan (d); return 0; } + " + HAVE_ISNAN) + +CHECK_CXX_SOURCE_COMPILES( + " + #include + int main(){ double d=0; _isnan (d); return 0; } + " + HAVE_UNDERSCORE_ISNAN) + +CHECK_CXX_SOURCE_COMPILES( + " + #include + int main(){ double d=0; std::isfinite (d); return 0; } + " + DEAL_II_HAVE_ISFINITE) + + + # -# Checks for various header files: +# Checks for various header files: # TODO: Obsolete? # CHECK_INCLUDE_FILES("stdint.h" HAVE_STDINT_H) @@ -207,7 +230,3 @@ CHECK_INCLUDE_FILES("sys/stat.h" HAVE_SYS_STAT_H) CHECK_INCLUDE_FILES("sys/syscall.h" HAVE_SYS_SYSCALL_H) CHECK_INCLUDE_FILES("sys/times.h" HAVE_SYS_TIMES_H) CHECK_INCLUDE_FILES("sys/types.h" HAVE_SYS_TYPES_H) - - - - diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index ad9782919f..e6c1a0bdd9 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -220,6 +220,15 @@ classes. */ #cmakedefine DEAL_II_CAN_USE_CXX1X +/* Defined if isnan is available */ +#cmakedefine HAVE_ISNAN + +/* Defined if _isnan is available */ +#cmakedefine HAVE_UNDERSCORE_ISNAN + +/* Defined if std::isfinite is available */ +#cmakedefine DEAL_II_HAVE_ISFINITE + /* Defined if you have the header file. */ #cmakedefine HAVE_STDINT_H @@ -244,10 +253,6 @@ /* Defined if you have the header file. */ #cmakedefine HAVE_SYS_TYPES_H -/* Defined if you have the `strtrs_' function. */ -#cmakedefine HAVE_STRTRS_ /* TODO */ - - #include diff --git a/deal.II/include/deal.II/base/config.h.in.old b/deal.II/include/deal.II/base/config.h.in.old index 9b8e2095ec..6ce0d15cfa 100644 --- a/deal.II/include/deal.II/base/config.h.in.old +++ b/deal.II/include/deal.II/base/config.h.in.old @@ -73,9 +73,6 @@ libraries */ #cmakedefine DEAL_II_HAVE_DARWIN_DYNACAST_BUG -/* Defined if std::isfinite is available */ -#cmakedefine DEAL_II_HAVE_ISFINITE - /* Flag indicating whether the library shall be compiled to use the Tecplot interface */ #cmakedefine DEAL_II_HAVE_TECPLOT @@ -513,3 +510,7 @@ # pragma warning( disable : 4789 ) // destination of memory copy is too small # pragma warning( disable : 4808 ) // case 'value' is not a valid value for switch condition of type 'bool #endif // DEAL_II_MSVC + + +/* Defined if you have the `strtrs_' function. */ +#cmakedefine HAVE_STRTRS_ /* TODO */