keep check_nekrs.mk in makefile

anshchaube · Jun 6, 2024 · ce4d86a · ce4d86a
1 parent 0186661
commit ce4d86a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -69,6 +69,11 @@ PETSC_ARCH          ?= arch-moose
 LIBMESH_DIR         ?= $(MOOSE_DIR)/libmesh/installed/
 CONTRIB_INSTALL_DIR ?= $(CARDINAL_DIR)/install
 
+# Check that NEKRS_HOME is set to the correct location
+ifeq ($(ENABLE_NEK), yes)
+  include $(CARDINAL_DIR)/config/check_nekrs.mk
+endif
+
 # This is the Eigen3 location on CIVET. If you are using MOOSE's conda environment,
 # you don't need to set these variables, because conda sets them for you. The only
 # scenario where you might need to manually set these is if you're not using the
@@ -185,7 +190,6 @@ endif
 # MOOSE core objects
 # ======================================================================================
 
-# framework
 FRAMEWORK_DIR      := $(MOOSE_DIR)/framework
 include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk

diff --git a/config/check_deps.mk b/config/check_deps.mk
@@ -42,11 +42,6 @@ ifeq ($(ENABLE_DAGMC),$(filter $(ENABLE_DAGMC), true yes on 1 TRUE YES ON))
   ENABLE_DAGMC := yes
 endif
 
-# Check that NEKRS_HOME is set to the correct location
-ifeq ($(ENABLE_NEK), yes)
-  include config/check_nekrs.mk
-endif
-
 ifeq ($(ENABLE_OPENMC), yes)
   # HDF5 is only needed to be linked if using OpenMC
   $(info Cardinal is using HDF5 from      $(HDF5_ROOT))