Merge pull request #1 from jedwards4b/nuopc_nag_port

add fox module path to nuopc build
jedwards4b · Feb 16, 2021 · 4933c48 · 4933c48
2 parents ef1ca46 + ee3fdeb
commit 4933c48
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/scripts/Tools/Makefile b/scripts/Tools/Makefile
@@ -107,8 +107,17 @@ ifeq (,$(SHAREDPATH))
   INSTALL_SHAREDPATH = $(EXEROOT)/$(SHAREDPATH)
 endif
 
+#===============================================================================
+# User-specified INCLDIR
+#===============================================================================
+INCLDIR := -I.
+ifdef USER_INCLDIR
+  INCLDIR += $(USER_INCLDIR)
+endif
+
 ifeq ($(COMP_INTERFACE), nuopc)
    CPPDEFS += -DNUOPC_INTERFACE
+   INCLDIR += -I$(SHAREDLIBROOT)/$(SHAREDPATH)/CDEPS/fox/include
    # FoX libraries are provided and built by CDEPS
    FoX_LIBS := -L$(SHAREDLIBROOT)/$(SHAREDPATH)/CDEPS/fox/lib -lFoX_wxml -lFoX_dom -lFoX_sax -lFoX_common -lFoX_utils -lFoX_fsys
    ULIBS += -L$(SHAREDLIBROOT)/$(SHAREDPATH)/CDEPS/dshr -ldshr -L$(SHAREDLIBROOT)/$(SHAREDPATH)/CDEPS/streams -lstreams
@@ -345,14 +354,6 @@ ifeq  ($(findstring pio,$(MODEL)),pio)
   endif
 endif
 
-#===============================================================================
-# User-specified INCLDIR
-#===============================================================================
-INCLDIR := -I.
-ifdef USER_INCLDIR
-  INCLDIR += $(USER_INCLDIR)
-endif
-
 #===============================================================================
 # MPI-serial library (part of MCT)
 #===============================================================================