Skip to content

Commit

Permalink
Merge pull request #167 from Goddard-Fortran-Ecosystem/bugfix/#164-op…
Browse files Browse the repository at this point in the history
…enmp-propagation

Fixes #164 - OpenMP fix for gmake builds
  • Loading branch information
tclune authored Dec 8, 2019
2 parents fff3bad + 1779441 commit 122aa1b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions cmake/PFUNIT.mk.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,22 @@ PFUNIT_BIN_DIR := $(PFUNIT_TOP_DIR)/bin
PFUNIT_INCLUDE_DIR := $(PFUNIT_TOP_DIR)/include

PFUNIT_EXTRA_FFLAGS := -I$(GFTL_INCLUDE_DIR) -I$(GFTL_SHARED_INCLUDE_DIR) -I$(FARGPARSE_INCLUDE_DIR) -I$(PFUNIT_INCLUDE_DIR) -I.
PFUNIT_EXTRA_FFLAGS += @OpenMP_Fortran_FLAGS@
ifeq ($(USEMPI),YES)
PFUNIT_EXTRA_FFLAGS += $(foreach inc,$(subst ;, ,@MPI_Fortran_INCLUDE_DIRS@), -I$(inc))
endif

PFUNIT_LIBRARIES := -L$(PFUNIT_TOP_DIR)/lib

ifeq ($(USEMPI),YES)
PFUNIT_LIBRARIES += -lpfunit
endif
PFUNIT_LIBRARIES += -lfunit $(FARGPARSE_LIBRARIES)
ifeq ($(USEMPI),YES)
PFUNIT_LIBRARIES += $(subst ;, ,@MPI_Fortran_LIBRARIES@)
endif
PFUNIT_LIBRARIES += @OpenMP_Fortran_LIBRARIES@



###########
Expand Down

0 comments on commit 122aa1b

Please sign in to comment.