Skip to content
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.

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

Additional improvements to moose.mk #5054

Merged
merged 1 commit into from
May 12, 2015
Merged
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions framework/moose.mk
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@ moose_revision:
$(moose_revision_header) MOOSE)

# libmesh submodule status
libmesh_status := $(shell git -C $(MOOSE_DIR) submodule status)
libmesh_status := $(shell git -C $(MOOSE_DIR) submodule status 2>/dev/null)
ifneq (,$(findstring +,$(libmesh_status)))
libmesh_message = "\n***WARNING***\nYour libmesh is out of date.\nYou need to run update_and_rebuild_libmesh.sh in the scripts directory.\n\n"
ifneq ($(origin MOOSE_DIR),environment)
libmesh_message = "\n***WARNING***\nYour libmesh is out of date.\nYou need to run update_and_rebuild_libmesh.sh in the scripts directory.\n\n"
endif
endif
libmesh_submodule_status:
@if [ x$(libmesh_message) != "x" ]; then echo $(libmesh_message); fi
Expand Down