From c6b81c6843968e693b064711bc2229367c43af7d Mon Sep 17 00:00:00 2001
From: Rene Milk <rene.milk@uni-muenster.de>
Date: Tue, 24 Jul 2012 12:08:38 +0200
Subject: [PATCH] [tests] update infrastructure so all tests compile
testing with ctest also works
---
CMakeLists.txt | 4 ++--
cmake/DuneUtils.cmake | 10 +++++++---
dune/stuff/test/CMakeLists.txt | 1 +
dune/stuff/test/common_math.cc | 2 ++
dune/stuff/test/common_profiler.cc | 2 ++
dune/stuff/test/common_string.cc | 2 ++
dune/stuff/test/common_typenames.cc | 2 ++
dune/stuff/test/fem_error.cc | 2 ++
8 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5508874e9..fb4fb84ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ SET( BLAS_LIB
"" )
SET( GRIDTYPE
- "SGRID" CACHE STRING
+ "YASPGRID" CACHE STRING
"GRIDTYPE" )
SET( GRIDDIM
@@ -43,7 +43,7 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_config.h.in ${CMAKE_CURR
INCLUDE_DIR( ${dune-stuff_BINARY_DIR} ${dune-stuff_SOURCE_DIR} )
ADD_CXX_FLAGS( ${CUSTOM_FLAGS} )
-ADD_DUNE_MODULES( common istl grid fem )
+ADD_DUNE_MODULES( common istl grid fem geometry localfunctions)
LINK_DIRECTORIES( "/usr/lib" ${CCGNU_LIBRARY_DIRS} )
diff --git a/cmake/DuneUtils.cmake b/cmake/DuneUtils.cmake
index 33b82c90c..434a05244 100644
--- a/cmake/DuneUtils.cmake
+++ b/cmake/DuneUtils.cmake
@@ -71,6 +71,10 @@ MACRO( ADD_DUNE_MODULES )
LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/lib/.libs )
FILE( GLOB_RECURSE tmp_header "${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/dune/${MODULE}/*.hh" )
LIST( APPEND DUNE_HEADERS ${tmp_header} )
+ SET( tmp_lib ${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/lib/.libs/libdune${MODULE}.a )
+ IF( EXISTS ${tmp_lib} )
+ LIST( APPEND DUNE_LIBS ${tmp_lib} )
+ ENDIF( EXISTS ${tmp_lib} )
ENDFOREACH(MODULE)
ENDMACRO( ADD_DUNE_MODULES )
@@ -152,17 +156,17 @@ else()
endif(CXX_FLAG_CXX11)
SET( CUSTOM_FLAGS
- "-Wall -Wextra -Wlogical-op -Wc++0x-compat -Wparentheses -pedantic -Waggregate-return -Wmissing-declarations -Wredundant-decls -Wshadow -Winline -fno-strict-aliasing" CACHE STRING
+ "-Wall -Wextra -Wlogical-op -Wc++0x-compat -Wparentheses -pedantic -Wredundant-decls -Wshadow -Winline -fno-strict-aliasing" CACHE STRING
"CUSTOM FLAGS")
SET( BOOST_ROOT
"/opt/boost-1.48" CACHE STRING
"" )
SET( CMAKE_CXX_FLAGS_RELEASE
- "-ffast-math -funroll-loops -m64 -mfpmath=sse -falign-loops -mtune=native -march=native -O3 -pipe -fomit-frame-pointer " )
+ "-DDNDEBUG -funroll-loops -m64 -mfpmath=sse -falign-loops -mtune=native -march=native -O3 -pipe -fomit-frame-pointer " )
SET( CMAKE_CXX_FLAGS_DEBUG
- "-DDNDEBUG -g3 -ggdb" )
+ "-O0 -DDNDEBUG -g3 -ggdb" )
FIND_PACKAGE( PkgConfig )
FIND_PACKAGE(Boost 1.42.0 REQUIRED)
diff --git a/dune/stuff/test/CMakeLists.txt b/dune/stuff/test/CMakeLists.txt
index 6b039a89b..c0f2dff52 100644
--- a/dune/stuff/test/CMakeLists.txt
+++ b/dune/stuff/test/CMakeLists.txt
@@ -5,4 +5,5 @@ foreach( source ${test_sources} )
get_filename_component(testname ${source} NAME_WE)
add_executable( ${testname} ${source} )
add_test( ${testname} ${CMAKE_CURRENT_BINARY_DIR}/${testname} )
+ target_link_libraries( ${testname} boost_filesystem boost_system ${DUNE_LIBS})
endforeach( source )
\ No newline at end of file
diff --git a/dune/stuff/test/common_math.cc b/dune/stuff/test/common_math.cc
index f08521dfd..5c705777b 100644
--- a/dune/stuff/test/common_math.cc
+++ b/dune/stuff/test/common_math.cc
@@ -4,6 +4,8 @@
#include <config.h>
#endif // ifdef HAVE_CMAKE_CONFIG
+#include <dune/common/mpihelper.hh>
+
int main(int argc, char** argv)
{
try {
diff --git a/dune/stuff/test/common_profiler.cc b/dune/stuff/test/common_profiler.cc
index f08521dfd..5c705777b 100644
--- a/dune/stuff/test/common_profiler.cc
+++ b/dune/stuff/test/common_profiler.cc
@@ -4,6 +4,8 @@
#include <config.h>
#endif // ifdef HAVE_CMAKE_CONFIG
+#include <dune/common/mpihelper.hh>
+
int main(int argc, char** argv)
{
try {
diff --git a/dune/stuff/test/common_string.cc b/dune/stuff/test/common_string.cc
index f08521dfd..5c705777b 100644
--- a/dune/stuff/test/common_string.cc
+++ b/dune/stuff/test/common_string.cc
@@ -4,6 +4,8 @@
#include <config.h>
#endif // ifdef HAVE_CMAKE_CONFIG
+#include <dune/common/mpihelper.hh>
+
int main(int argc, char** argv)
{
try {
diff --git a/dune/stuff/test/common_typenames.cc b/dune/stuff/test/common_typenames.cc
index f08521dfd..5c705777b 100644
--- a/dune/stuff/test/common_typenames.cc
+++ b/dune/stuff/test/common_typenames.cc
@@ -4,6 +4,8 @@
#include <config.h>
#endif // ifdef HAVE_CMAKE_CONFIG
+#include <dune/common/mpihelper.hh>
+
int main(int argc, char** argv)
{
try {
diff --git a/dune/stuff/test/fem_error.cc b/dune/stuff/test/fem_error.cc
index f08521dfd..5c705777b 100644
--- a/dune/stuff/test/fem_error.cc
+++ b/dune/stuff/test/fem_error.cc
@@ -4,6 +4,8 @@
#include <config.h>
#endif // ifdef HAVE_CMAKE_CONFIG
+#include <dune/common/mpihelper.hh>
+
int main(int argc, char** argv)
{
try {
--
GitLab