Skip to content

Commit 249b797

Browse files
committed
disable clang-format for cmake generated code, fix missing include
1 parent 7e5f6e3 commit 249b797

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

cmake/config.hpp.in

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,22 @@
1515
#define OOMPH_ENABLE_DEVICE HWMALLOC_ENABLE_DEVICE
1616
#define OOMPH_DEVICE_RUNTIME HWMALLOC_DEVICE_RUNTIME
1717
#if defined(HWMALLOC_DEVICE_HIP)
18-
# define OOMPH_DEVICE_HIP
18+
# define OOMPH_DEVICE_HIP
1919
#elif defined(HWMALLOC_DEVICE_CUDA)
20-
# define OOMPH_DEVICE_CUDA
20+
# define OOMPH_DEVICE_CUDA
2121
#elif defined(HWMALLOC_DEVICE_EMULATE)
22-
# define OOMPH_DEVICE_EMULATE
22+
# define OOMPH_DEVICE_EMULATE
2323
#else
24-
# define OOMPH_DEVICE_NONE
24+
# define OOMPH_DEVICE_NONE
2525
#endif
2626

2727
#cmakedefine01 OOMPH_USE_FAST_PIMPL
2828
#cmakedefine01 OOMPH_ENABLE_BARRIER
29-
#define OOMPH_RECURSION_DEPTH @OOMPH_RECURSION_DEPTH @
29+
// clang-format off
30+
#define OOMPH_RECURSION_DEPTH @OOMPH_RECURSION_DEPTH@
31+
// clang-format on
3032

31-
#define OOMPH_VERSION @OOMPH_VERSION_NUMERIC @
32-
#define OOMPH_VERSION_MAJOR @OOMPH_VERSION_MAJOR @
33-
#define OOMPH_VERSION_MINOR @OOMPH_VERSION_MINOR @
34-
#define OOMPH_VERSION_PATCH @OOMPH_VERSION_PATCH @
33+
#define OOMPH_VERSION @OOMPH_VERSION_NUMERIC@
34+
#define OOMPH_VERSION_MAJOR @OOMPH_VERSION_MAJOR@
35+
#define OOMPH_VERSION_MINOR @OOMPH_VERSION_MINOR@
36+
#define OOMPH_VERSION_PATCH @OOMPH_VERSION_PATCH@

include/oomph/detail/communicator_helper.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <boost/callable_traits.hpp>
1414
#include <oomph/request.hpp>
1515
#include <oomph/util/pool_factory.hpp>
16+
#include <oomph/message_buffer.hpp>
1617
//#include <oomph/util/tag_range.hpp>
1718

1819
#define OOMPH_CHECK_CALLBACK_F(CALLBACK, RANK_TYPE, TAG_TYPE) \

0 commit comments

Comments
 (0)