Be more compatible with the trunk.

[[Imported from SVN: r6638]]

CMakeLists.txt

@@ -54,6 +54,7 @@ find_package(CXX11Features)
 include(CheckIncludeFile)
 include(CheckIncludeFileCXX)
 check_include_file("malloc.h" HAVE_MALLOC_H)
+check_include_file("stdint.h" HAVE_STDINT_H)
 check_include_file_cxx("memory" HAVE_MEMORY)
 set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -DHAVE_MEMORY=${HAVE_MEMORY}")
 

cmake/modules/FindSharedPtr.cmake

@@ -6,6 +6,8 @@ macro(CHECK_MAKE_SHARED)
     CHECK_INCLUDE_FILE_CXX("boost/make_shared.hpp" HAVE_BOOST_MAKE_SHARED_HPP)
   endif(SHARED_PTR_NAMESPACE EQUAL "boost")
 
+  CHECK_INCLUDE_FILE_CXX("boost/shared_ptr.hpp" HAVE_BOOST_SHARED_PTR_HPP)
+
   CHECK_CXX_SOURCE_COMPILES("
     #if defined(HAVE_MEMORY)
     # include <memory>

config.h.cmake

@@ -42,7 +42,7 @@
 /* Define if you have a BLAS library. */
 #cmakedefine HAVE_BLAS 1
 
-/* Define to 1 if you have <boost/make_shared.hpp>, */
+/* Define to 1 if you have <boost/make_shared.hpp>. */
 #cmakedefine HAVE_BOOST_MAKE_SHARED_HPP 1
 
 /* Define to 1 if you have the <boost/shared_ptr.hpp> header file. */
@@ -51,7 +51,7 @@
 /* Define if you have LAPACK library. */
 #cmakedefine HAVE_LAPACK 1
 
-/* Define to 1 if SHARED_PTR_NAMESPACE::make_shared is usable */
+/* Define to 1 if SHARED_PTR_NAMESPACE::make_shared is usable. */
 #cmakedefine HAVE_MAKE_SHARED 1
 
 /* Define to 1 if you have the <malloc.h> header file. */
@@ -63,27 +63,49 @@
 #cmakedefine HAVE_MPI ENABLE_MPI
 
 /* Define to 1 if nullptr is supported */
-#cmakedefine HAVE_NULLPTR
+#cmakedefine HAVE_NULLPTR 1
 
 /* Define to 1 if static_assert is supported */
-#cmakedefine HAVE_STATIC_ASSERT
+#cmakedefine HAVE_STATIC_ASSERT 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#cmakedefine HAVE_STDINT_H 1
 
 /* Define to 1 if the MPI2 Standard is supported */
 #cmakedefine MPI_2 1
 
+/* Name of package */
+#define PACKAGE "dune-common"
 
-#cmakedefine HAVE_BOOST 1
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "@DUNE_MAINTAINER@"
 
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "@DUNE_MOD_NAME@"
 
-/* Define to 1 if you have the <memory> header file. */
-#cmakedefine HAVE_MEMORY 1
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "@DUNE_MOD_NAME@ @DUNE_MOD_VERSION@"
 
-/* The namespace in which SHARED_PTR can be found */
-#cmakedefine SHARED_PTR_NAMESPACE ${SHARED_PTR_NAMESPACE}
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "@DUNE_MOD_NAME@"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL "@DUNE_MOD_URL@"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "@DUNE_MOD_VERSION@"
+
+#cmakedefine HAVE_BOOST 1
 
 /* The header in which SHARED_PTR can be found */
 #cmakedefine SHARED_PTR_HEADER ${SHARED_PTR_HEADER}
 
+/* The namespace in which SHARED_PTR can be found */
+#cmakedefine SHARED_PTR_NAMESPACE ${SHARED_PTR_NAMESPACE}
+
+/* Version number of package */
+#define VERSION "@DUNE_MOD_VERSION@"
+
 /* Define to 1 if variadic templates are supported */
 #cmakedefine HAVE_VARIADIC_TEMPLATES 1