Skip to content
Snippets Groups Projects
Commit 42fce34e authored by Markus Blatt's avatar Markus Blatt
Browse files

[Merge][CMake] Merged revisions : 6662

Revision  r6662
.----------------------
Adhere to naming convention of macro files, macro and function names.

.----------------------


[[Imported from SVN: r7190]]
parents 08196978 9879bc9d
No related branches found
No related tags found
No related merge requests found
......@@ -19,4 +19,4 @@ MACRO(create_doc_install filename targetdir)
ENDMACRO(create_doc_install)
# Support building documentation with doxygen.
include(DUNEDoxygen)
include(DuneDoxygen)
File moved
......@@ -27,7 +27,7 @@ if(MPI_FOUND)
endif(MPI_FOUND)
# A macro that adds the MPI flags for the compilation
function(add_DUNE_MPI_flags _target)
function(add_dune_mpi_flags _target)
if(MPI_FOUND)
target_link_libraries(${_target} ${MPI_DUNE_LIBRARIES})
# The definitions are a hack as we do not seem to know which MPI implementation was
......
......@@ -151,7 +151,7 @@ macro(dune_project)
add_definitions(-DHAVE_CONFIG_H)
# Search for MPI and set the relevant variables.
include(DUNEMPI)
include(DuneMPI)
# Make calling fortran routines from C/C++ possible
......@@ -170,7 +170,7 @@ macro(dune_project)
# Create custom target for building the documentation
# and provide macros for installing the docs and force
# building them before.
include(DUNEDoc)
include(DuneDoc)
# activate testing the DUNE way
include(DuneTests)
......
......@@ -6,18 +6,18 @@ add_dependencies(build_tests ${MPITESTPROGS})
add_executable("indexsettest" indexsettest.cc)
target_link_libraries("indexsettest" "dunecommon" ${CMAKE_THREAD_LIBS_INIT} ${})
include(DUNEMPI)
include(DuneMPI)
add_executable("indicestest" indicestest.cc)
target_link_libraries("indicestest" "dunecommon")
add_DUNE_MPI_flags(indicestest)
add_dune_mpi_flags(indicestest)
add_executable("selectiontest" selectiontest.cc)
target_link_libraries("selectiontest" "dunecommon")
add_DUNE_MPI_flags(selectiontest)
add_dune_mpi_flags(selectiontest)
add_executable("syncertest" syncertest.cc)
target_link_libraries("syncertest" "dunecommon")
add_DUNE_MPI_flags(syncertest)
add_dune_mpi_flags(syncertest)
add_test(indexsettest indexsettest)
add_test(selectiontest selectiontest)
......
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