Merge remote-tracking branch 'upstream/master'

cmake/Modules/FindCXX11Features.cmake

@@ -3,6 +3,7 @@
 #
 # Sets the follwing variable:
 #
+# HAVE_TYPE_TRAITS                 True if the <type_traits> header is available and implements sufficient functionality
 # HAVE_SHARED_PTR                  True if std::shared_ptr is available
 # HAVE_UNIQUE_PTR                  True if std::unique_ptr is available
 # HAVE_NULLPTR                     True if nullptr is available
@@ -45,6 +46,22 @@ endif(CXX_FLAG_CXX11)
 # perform tests
 include(CheckCXXSourceCompiles)
 
+# std::is_convertible, std::is_base_of
+CHECK_CXX_SOURCE_COMPILES("
+#include <type_traits>
+
+class Base {};
+class Derived : public Base {};
+
+int main()
+{
+    bool foo = std::is_convertible<int, double>::value;
+    bool bar = std::is_base_of<Base, Derived>::value;
+    return 0;
+}
+"  HAVE_TYPE_TRAITS
+)
+
 # nullptr
 CHECK_CXX_SOURCE_COMPILES("
     #include <memory>
@@ -322,6 +339,10 @@ endforeach(_HEADER tuple tr1/tuple tr1/type_traits)
 # superset of those provided by GCC 4.4. This makes the test fail on
 # all GCC compilers before 4.4.
 set(CXX_FEATURES_MISSING "")
+if (NOT HAVE_TYPE_TRAITS)
+  set(CXX_FEATURES_MISSING
+      "${CXX_FEATURES_MISSING} - Sufficiently conformant type traits (defined by the 'type_traits' header file)\n")
+endif()
 if (NOT HAVE_SHARED_PTR)
   set(CXX_FEATURES_MISSING
       "${CXX_FEATURES_MISSING} - Shared pointers (the std::shared_ptr class)\n")

cmake/Modules/FindCxaDemangle.cmake

@@ -0,0 +1,17 @@
+# Module that checks whether the compiler supports the
+# abi::__cxa_demangle function required to
+# make the type names returned by typeid() human-readable
+#
+# Sets the following variable:
+# HAVE_CXA_DEMANGLE
+#
+# perform tests
+include(CheckCXXSourceCompiles)
+
+CHECK_CXX_SOURCE_COMPILES("#include <cxxabi.h>
+int main(void){
+    int foobar = 0;
+    const char *foo = typeid(foobar).name();
+    int status;
+    char *demangled = abi::__cxa_demangle( foo, 0, 0, &status );
+}" HAVE_CXA_DEMANGLE)

cmake/Modules/FindQuadmath.cmake

@@ -0,0 +1,31 @@
+# Module that checks whether the compiler supports the
+# quadruple precision floating point math
+#
+# Sets the following variables:
+# HAVE_QUAD
+# QUADMATH_LIBRARIES
+#
+# perform tests
+include(CheckCXXSourceCompiles)
+include(CMakePushCheckState)
+
+cmake_push_check_state()
+list(APPEND CMAKE_REQUIRED_LIBRARIES "quadmath")
+CHECK_C_SOURCE_COMPILES("
+#include <quadmath.h>
+
+int main(void){
+    __float128 foo = sqrtq(123.456);
+}" HAVE_QUAD)
+cmake_pop_check_state()
+
+if (HAVE_QUAD)
+  set(QUADMATH_LIBRARIES "quadmath")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(QuadMath
+  DEFAULT_MSG
+  QUADMATH_LIBRARIES
+  HAVE_QUAD
+  )

cmake/Modules/FindValgrind.cmake

@@ -0,0 +1,25 @@
+# Find Valgrind.
+#
+# This module defines:
+#  VALGRIND_INCLUDE_DIR, where to find valgrind/memcheck.h, etc.
+#  VALGRIND_PROGRAM, the valgrind executable.
+#  VALGRIND_FOUND, If false, do not try to use valgrind.
+#
+# If you have valgrind installed in a non-standard place, you can define
+# VALGRIND_ROOT to tell cmake where it is.
+if (VALGRIND_FOUND)
+  return()
+endif()
+
+find_path(VALGRIND_INCLUDE_DIR valgrind/memcheck.h
+  /usr/include /usr/local/include ${VALGRIND_ROOT}/include)
+
+# if VALGRIND_ROOT is empty, we explicitly add /bin to the search
+# path, but this does not hurt...
+find_program(VALGRIND_PROGRAM NAMES valgrind PATH ${VALGRIND_ROOT}/bin)
+
+find_package_handle_standard_args(VALGRIND DEFAULT_MSG
+  VALGRIND_INCLUDE_DIR
+  VALGRIND_PROGRAM)
+
+mark_as_advanced(VALGRIND_ROOT VALGRIND_INCLUDE_DIR VALGRIND_PROGRAM)