From 03158693b46c7b78fa37cba4ac1687a2d7bc951f Mon Sep 17 00:00:00 2001
From: Felix Albrecht <felix.albrecht@uni-muenster.de>
Date: Wed, 16 Jan 2013 17:01:22 +0100
Subject: [PATCH] [cmake] update
---
CMakeLists.txt | 2 +-
cmake/cmake_config.h.in | 21 +++------------------
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3bea9f72e..b5238ef6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,7 @@ ENDIF( ${GRIDTYPE} MATCHES "ALBERTAGRID" )
CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/cmake_config.h )
# other dune modules
-ADD_DUNE_MODULES(common fem geometry grid grid-multiscale stuff)
+ADD_DUNE_MODULES(common fem geometry grid grid-multiscale stuff localfunctions)
set(COMMON_LIBS
${DUNE_LIBS}
${BLAS_LIB}
diff --git a/cmake/cmake_config.h.in b/cmake/cmake_config.h.in
index 36b2f2e2b..743d41567 100644
--- a/cmake/cmake_config.h.in
+++ b/cmake/cmake_config.h.in
@@ -1,21 +1,10 @@
-#ifndef DUNE_STUFF_CONFIG_H
-#define DUNE_STUFF_CONFIG_H
-
-#undef COMMIT
-
-/* the git tag / commit we build from */
-#define COMMIT "@COMMIT@"
+#ifndef DUNE_DETAILED_DISCRETIZATIONS_CONFIG_H
+#define DUNE_DETAILED_DISCRETIZATIONS_CONFIG_H
#define @GRIDTYPE@
#define GRIDDIM @GRIDDIM@
#define POLORDER @POLORDER@
-#define DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD 1
-
-#ifdef NDEBUG
- #define DNDEBUG
-#endif
-
#include "config.h"
#if !HAVE_GRIDTYPE
@@ -31,8 +20,4 @@
}
#endif
-// enable these when dropping autotools
-//#cmakedefine HAS_LAMBDA_FUNCTIONS 1
-//#cmakedefine HAS_STD_BEGIN_END 1
-
-#endif /* DUNE_STUFF_CONFIG_H */
+#endif /* DUNE_DETAILED_DISCRETIZATIONS_CONFIG_H */
--
GitLab