Skip to content
Snippets Groups Projects
Commit c6b81c68 authored by René Fritze's avatar René Fritze
Browse files

[tests] update infrastructure so all tests compile

testing with ctest also works
parent 0731265e
No related branches found
No related tags found
No related merge requests found
...@@ -30,7 +30,7 @@ SET( BLAS_LIB ...@@ -30,7 +30,7 @@ SET( BLAS_LIB
"" ) "" )
SET( GRIDTYPE SET( GRIDTYPE
"SGRID" CACHE STRING "YASPGRID" CACHE STRING
"GRIDTYPE" ) "GRIDTYPE" )
SET( GRIDDIM SET( GRIDDIM
...@@ -43,7 +43,7 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_config.h.in ${CMAKE_CURR ...@@ -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} ) INCLUDE_DIR( ${dune-stuff_BINARY_DIR} ${dune-stuff_SOURCE_DIR} )
ADD_CXX_FLAGS( ${CUSTOM_FLAGS} ) 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} ) LINK_DIRECTORIES( "/usr/lib" ${CCGNU_LIBRARY_DIRS} )
......
...@@ -71,6 +71,10 @@ MACRO( ADD_DUNE_MODULES ) ...@@ -71,6 +71,10 @@ MACRO( ADD_DUNE_MODULES )
LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/lib/.libs ) LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/lib/.libs )
FILE( GLOB_RECURSE tmp_header "${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/dune/${MODULE}/*.hh" ) FILE( GLOB_RECURSE tmp_header "${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/dune/${MODULE}/*.hh" )
LIST( APPEND DUNE_HEADERS ${tmp_header} ) 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) ENDFOREACH(MODULE)
ENDMACRO( ADD_DUNE_MODULES ) ENDMACRO( ADD_DUNE_MODULES )
...@@ -152,17 +156,17 @@ else() ...@@ -152,17 +156,17 @@ else()
endif(CXX_FLAG_CXX11) endif(CXX_FLAG_CXX11)
SET( CUSTOM_FLAGS 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") "CUSTOM FLAGS")
SET( BOOST_ROOT SET( BOOST_ROOT
"/opt/boost-1.48" CACHE STRING "/opt/boost-1.48" CACHE STRING
"" ) "" )
SET( CMAKE_CXX_FLAGS_RELEASE 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 SET( CMAKE_CXX_FLAGS_DEBUG
"-DDNDEBUG -g3 -ggdb" ) "-O0 -DDNDEBUG -g3 -ggdb" )
FIND_PACKAGE( PkgConfig ) FIND_PACKAGE( PkgConfig )
FIND_PACKAGE(Boost 1.42.0 REQUIRED) FIND_PACKAGE(Boost 1.42.0 REQUIRED)
......
...@@ -5,4 +5,5 @@ foreach( source ${test_sources} ) ...@@ -5,4 +5,5 @@ foreach( source ${test_sources} )
get_filename_component(testname ${source} NAME_WE) get_filename_component(testname ${source} NAME_WE)
add_executable( ${testname} ${source} ) add_executable( ${testname} ${source} )
add_test( ${testname} ${CMAKE_CURRENT_BINARY_DIR}/${testname} ) add_test( ${testname} ${CMAKE_CURRENT_BINARY_DIR}/${testname} )
target_link_libraries( ${testname} boost_filesystem boost_system ${DUNE_LIBS})
endforeach( source ) endforeach( source )
\ No newline at end of file
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include <config.h> #include <config.h>
#endif // ifdef HAVE_CMAKE_CONFIG #endif // ifdef HAVE_CMAKE_CONFIG
#include <dune/common/mpihelper.hh>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
try { try {
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include <config.h> #include <config.h>
#endif // ifdef HAVE_CMAKE_CONFIG #endif // ifdef HAVE_CMAKE_CONFIG
#include <dune/common/mpihelper.hh>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
try { try {
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include <config.h> #include <config.h>
#endif // ifdef HAVE_CMAKE_CONFIG #endif // ifdef HAVE_CMAKE_CONFIG
#include <dune/common/mpihelper.hh>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
try { try {
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include <config.h> #include <config.h>
#endif // ifdef HAVE_CMAKE_CONFIG #endif // ifdef HAVE_CMAKE_CONFIG
#include <dune/common/mpihelper.hh>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
try { try {
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include <config.h> #include <config.h>
#endif // ifdef HAVE_CMAKE_CONFIG #endif // ifdef HAVE_CMAKE_CONFIG
#include <dune/common/mpihelper.hh>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
try { try {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment