Skip to content

Commit

Permalink
Turn off tests for Moab and DAGMC. Refs neams-th-coe#536
Browse files Browse the repository at this point in the history
  • Loading branch information
aprilnovak committed Jan 9, 2023
1 parent 1ee04f0 commit 7481403
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,16 @@ ifeq ($(ENABLE_NEK), yes)
include $(CARDINAL_DIR)/config/nekrs.mk
else

# autoconf-archive puts some arguments (e.g. -std=c++17) into the compiler
# variable rather than the compiler flags variable.
#
# cmake allows this, but wants any compiler arguments to be
# semicolon-separated, not space-separated
space := $(subst ,, )
LIBMESH_CC_LIST := $(subst $(space),;,$(libmesh_CC))
LIBMESH_CXX_LIST := $(subst $(space),;,$(libmesh_CXX))
LIBMESH_F90_LIST := $(subst $(space),;,$(libmesh_F90))

build_nekrs:
$(info Skipping Nek build because ENABLE_NEK is not set to 'yes')

Expand Down
2 changes: 2 additions & 0 deletions config/dagmc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ $(DAGMC_BUILDDIR)/Makefile: build_moab | $(DAGMC_DIR)/CMakeLists.txt
cd $(DAGMC_BUILDDIR) && \
cmake -L \
-DBUILD_TALLY=ON \
-DBUILD_TESTS=OFF \
-DBUILD_CI_TESTS=OFF \
-DBUILD_STATIC_LIBS=OFF \
-DBUILD_STATIC_EXE=OFF \
-DMOAB_DIR=$(MOAB_INSTALL_DIR) \
Expand Down
1 change: 1 addition & 0 deletions config/moab.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ $(MOAB_BUILDDIR)/Makefile: $(MOAB_DIR)/CMakeLists.txt
cd $(MOAB_BUILDDIR) && \
cmake -L \
-DENABLE_HDF5=ON \
-DENABLE_TESTING=OFF \
-DHDF5_DIR=$(HDF5_ROOT) \
-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
-DCMAKE_C_COMPILER="$(LIBMESH_CC_LIST)" \
Expand Down
10 changes: 0 additions & 10 deletions config/nekrs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,6 @@ NEKRS_LIBP_DEFINES := -DUSE_NULL_PROJECTION=1
USE_OCCA_MEM_BYTE_ALIGN := 64
OCCA_CXXFLAGS := -O2 -ftree-vectorize -funroll-loops -march=native -mtune=native

# autoconf-archive puts some arguments (e.g. -std=c++17) into the compiler
# variable rather than the compiler flags variable.
#
# cmake allows this, but wants any compiler arguments to be
# semicolon-separated, not space-separated
space := $(subst ,, )
LIBMESH_CC_LIST := $(subst $(space),;,$(libmesh_CC))
LIBMESH_CXX_LIST := $(subst $(space),;,$(libmesh_CXX))
LIBMESH_F90_LIST := $(subst $(space),;,$(libmesh_F90))

$(NEKRS_BUILDDIR)/Makefile: $(NEKRS_DIR)/CMakeLists.txt
mkdir -p $(NEKRS_BUILDDIR)
cd $(NEKRS_BUILDDIR) && \
Expand Down

0 comments on commit 7481403

Please sign in to comment.