Skip to content
Snippets Groups Projects
Commit 66cb73fc authored by Christoph Gersbacher's avatar Christoph Gersbacher
Browse files

Merge remote-tracking branch 'origin/master' into feature/FS1191-assigner

parents 60c604e5 5414c5be
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,9 @@ macro(setup_headercheck)
#glob for headers
file(GLOB_RECURSE src_headers "src/*.hh")
file(GLOB_RECURSE dune_headers "dune/*.hh")
set_property(GLOBAL PROPERTY headercheck_list ${src_headers} ${dune_headers})
# strip hidden files
string(REGEX REPLACE "[^;]*/\\.[^;]*\\.hh;?" "" headers "${dune_headers};${src_headers}")
set_property(GLOBAL PROPERTY headercheck_list ${headers})
#define headercheck target
dune_common_script_dir(SCRIPT_DIR)
......@@ -66,4 +68,4 @@ macro(finalize_headercheck)
set_property(TARGET headercheck_${targname} PROPERTY ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/headercheck/${relpath}")
add_dune_all_flags(headercheck_${targname})
endforeach(header ${headerlist})
endmacro(finalize_headercheck)
\ No newline at end of file
endmacro(finalize_headercheck)
......@@ -95,6 +95,7 @@ install(FILES
typetraits.hh
unused.hh
version.hh
visibility.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/common)
# Install some test headers, because they get used by tests in other modules
......
......@@ -90,7 +90,8 @@ commoninclude_HEADERS = \
tupleutility.hh \
typetraits.hh \
unused.hh \
version.hh
version.hh \
visibility.hh
include $(top_srcdir)/am/global-rules
......
......@@ -12,6 +12,7 @@
#endif
#include <dune/common/stdstreams.hh>
#include <dune/common/visibility.hh>
namespace Dune
{
......@@ -86,7 +87,7 @@ namespace Dune
*
* \returns a fake communicator
*/
static MPICommunicator getCommunicator ()
DUNE_EXPORT static MPICommunicator getCommunicator ()
{
static MPICommunicator comm;
return comm;
......@@ -126,7 +127,7 @@ namespace Dune
* @param argc The number of arguments provided to main.
* @param argv The arguments provided to main.
*/
static FakeMPIHelper& instance(int argc, char** argv)
DUNE_EXPORT static FakeMPIHelper& instance(int argc, char** argv)
{
// create singleton instance
static FakeMPIHelper singleton;
......@@ -213,7 +214,7 @@ namespace Dune
* @param argc The number of arguments provided to main.
* @param argv The arguments provided to main.
*/
static MPIHelper& instance(int& argc, char**& argv)
DUNE_EXPORT static MPIHelper& instance(int& argc, char**& argv)
{
// create singleton instance
static MPIHelper singleton (argc, argv);
......
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