Skip to content

Commit

Permalink
Revert old src/incmake/component_CCPP.mk (#13)
Browse files Browse the repository at this point in the history
  • Loading branch information
RatkoVasic-NOAA authored Oct 28, 2019
1 parent 8cb7137 commit e0ad502
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions src/incmake/component_CCPP.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,15 @@ ccpp_mk=$(CCPP_BINDIR)/ccpp.mk
all_component_mk_files+=$(ccpp_mk)

# Location of source code and installation
CCPP_SRCDIR?=$(ROOTDIR)/FV3/ccpp
CCPP_BINDIR?=$(ROOTDIR)/FV3/ccpp

# Build directory - set to FV3 (later fv3atm) for old make (i.e. in-source) build
CCPP_BUILDDIR?=$(ROOTDIR)/FV3
CCPP_SRCDIR?=$(ROOTDIR)/ccpp
CCPP_BINDIR?=$(ROOTDIR)/ccpp

# Make sure we have a model that supports CCPP:
ifeq (,$(findstring FV3,$(COMPONENTS)))
$(error CCPP requires FV3)
else
# Ensure the model is selected.
override CCPP_CONFOPT += --config=$(CCPP_SRCDIR)/config/ccpp_prebuild_config.py --builddir=$(CCPP_BUILDDIR)
override CCPP_CONFOPT += --config=ccpp/config/ccpp_prebuild_config.py
override CCPP_MAKEOPT ?= $(FV3_MAKEOPT)
override CCPP_BUILDOPT ?= $(FV3_BUILDOPT)
endif
Expand Down Expand Up @@ -50,7 +47,7 @@ $(ccpp_mk): configure
set -xue ; \
export PATH_CCPP="$(CCPP_SRCDIR)" ; \
cd $(ROOTDIR) ; \
$$PATH_CCPP/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) ; \
./ccpp/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) ; \
cd $$PATH_CCPP ; \
./build_ccpp.sh ${BUILD_TARGET} "$$PATH_CCPP" $(ccpp_mk) \
"$(CCPP_MAKEOPT)" NO NO ; \
Expand Down

0 comments on commit e0ad502

Please sign in to comment.