Skip to content

Make CCPP default to support removal of IPD #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MinsukJi-NOAA merged 1 commit into from
Jan 14, 2021
Merged

Make CCPP default to support removal of IPD #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/incmake/component_FV3.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,10 @@ FV3_BINDIR?=$(ROOTDIR)/FV3/FV3_INSTALL
$(call require_dir,$(FV3_SRCDIR),FV3 source directory)

# Make sure we're setting CCPP=Y if CCPP is enabled:
ifneq (,$(findstring CCPP,$(COMPONENTS)))
ifeq (,$(findstring CCPP=Y,$(FV3_MAKEOPT)))
$(warning Adding CCPP=Y to FV3 make options because CCPP is listed as a component.)
override FV3_MAKEOPT += CCPP=Y
endif
ifeq (,$(findstring PATH_CCPP=,$(FV3_MAKEOPT)))
$(warning Adding PATH_CCPP to FV3 make options because CCPP is listed as a component.)
$(warning Adding PATH_CCPP to FV3 make options.)
override FV3_MAKEOPT += PATH_CCPP="$(CCPP_BINDIR)"
endif
endif

FV3_FULL_OPTS=\
COMP=FV3 \
Expand Down
5 changes: 1 addition & 4 deletions src/incmake/dependencies.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ FMS:
$(call prepend_component,$@)

FV3_DEPS=FMS

ifneq (,$(findstring CCPP=Y,$(COMPONENTS)))
FV3_DEPS += CCPP
endif
FV3_DEPS += CCPP

CCPP:
$(call prepend_component,$@)
Expand Down