Skip to content

Commit b853f3a

Browse files
necessary cmake steps
1 parent 2be1395 commit b853f3a

3 files changed

Lines changed: 26 additions & 0 deletions

File tree

src/config/ConduitConfig.cmake.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ set(CONDUIT_USE_CXX11 "@CONDUIT_USE_CXX11@")
3030
set(CONDUIT_USE_CXX14 "@CONDUIT_USE_CXX14@")
3131
set(CONDUIT_USE_FMT "@CONDUIT_USE_FMT@")
3232
set(CONDUIT_USE_CALIPER "@CONDUIT_USE_CALIPER@")
33+
set(CONDUIT_USE_RAJA "@RAJA_FOUND@")
34+
set(CONDUIT_USE_UMPIRE "@UMPIRE_FOUND@")
3335
set(CONDUIT_USE_MPI "@ENABLE_MPI@")
3436
set(CONDUIT_USE_OPENMP "@ENABLE_OPENMP@")
3537
set(CONDUIT_INSTALL_PREFIX "@CONDUIT_INSTALL_PREFIX@")

src/libs/conduit/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,14 @@ if(CALIPER_FOUND)
162162
list(APPEND conduit_thirdparty_libs caliper)
163163
endif()
164164

165+
if(RAJA_FOUND)
166+
list(APPEND conduit_thirdparty_libs RAJA)
167+
endif()
168+
169+
if(UMPIRE_FOUND)
170+
list(APPEND conduit_thirdparty_libs umpire)
171+
endif()
172+
165173
if(OPENMP_FOUND)
166174
list(APPEND conduit_thirdparty_libs ${conduit_blt_openmp_deps})
167175
endif()

src/libs/conduit/conduit_config.h.in

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,18 @@
5757

5858
#cmakedefine CONDUIT_USE_CALIPER
5959

60+
#cmakedefine01 RAJA_FOUND
61+
62+
#if RAJA_FOUND
63+
#define CONDUIT_USE_RAJA
64+
#endif
65+
66+
#cmakedefine01 UMPIRE_FOUND
67+
68+
#if UMPIRE_FOUND
69+
#define CONDUIT_USE_UMPIRE
70+
#endif
71+
6072
#cmakedefine CONDUIT_USE_OPENMP
6173

6274
#cmakedefine CONDUIT_USE_PARMETIS
@@ -71,6 +83,10 @@
7183
#define CONDUIT_DEVICE_SUPPORT_ENABLED
7284
#endif
7385

86+
#undef RAJA_FOUND
87+
88+
#undef UMPIRE_FOUND
89+
7490
#endif
7591

7692

0 commit comments

Comments
 (0)