Skip to content

Commit

Permalink
use same defaults for unit as main.
Browse files Browse the repository at this point in the history
  • Loading branch information
@aprilnovak
aprilnovak committed Jan 10, 2023
1 parent 8175eca commit 153502e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 0 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,9 @@ OCCA_OPENCL_ENABLED=0

DAGMC_BUILDDIR := $(CARDINAL_DIR)/build/DAGMC
DAGMC_INSTALL_DIR := $(CONTRIB_INSTALL_DIR)
DAGMC_LIBDIR := $(DAGMC_INSTALL_DIR)/lib

MOAB_BUILDDIR := $(CARDINAL_DIR)/build/moab
MOAB_INSTALL_DIR := $(CONTRIB_INSTALL_DIR)
MOAB_LIBDIR := $(MOAB_INSTALL_DIR)/lib

NEKRS_BUILDDIR := $(CARDINAL_DIR)/build/nekrs
NEKRS_INSTALL_DIR := $(CONTRIB_INSTALL_DIR)
Expand Down
4 changes: 1 addition & 3 deletions unit/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENABLE_NEK ?= yes
ENABLE_OPENMC ?= yes

# Whether you want to build OpenMC with DAGMC support; set to anything except 'yes' to skip
ENABLE_DAGMC ?= yes
ENABLE_DAGMC ?= no

CARDINAL_DIR := $(abspath $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))))/..
CONTRIB_DIR := $(CARDINAL_DIR)/contrib
Expand Down Expand Up @@ -96,11 +96,9 @@ OCCA_OPENCL_ENABLED=0

DAGMC_BUILDDIR := $(CARDINAL_DIR)/build/DAGMC
DAGMC_INSTALL_DIR := $(CONTRIB_INSTALL_DIR)
DAGMC_LIBDIR := $(DAGMC_INSTALL_DIR)/lib

MOAB_BUILDDIR := $(CARDINAL_DIR)/build/moab
MOAB_INSTALL_DIR := $(CONTRIB_INSTALL_DIR)
MOAB_LIBDIR := $(MOAB_INSTALL_DIR)/lib

NEKRS_BUILDDIR := $(CARDINAL_DIR)/build/nekrs
NEKRS_INSTALL_DIR := $(CONTRIB_INSTALL_DIR)
Expand Down

0 comments on commit 153502e

Please sign in to comment.