Permalink
Browse files

FDS build: correct makefile for outputting compiiler info

  • Loading branch information...
gforney committed Oct 31, 2017
1 parent 6f1f1cc commit a02cde38fb617b4f95c2113e5112b930d5f511bf
Showing with 4 additions and 4 deletions.
  1. +4 −4 Build/makefile
View
@@ -43,7 +43,7 @@ GITINFOPGI=-Mpreprocess $(GITINFO_BASE) -DBUILDDATE_PP=\""$(BUILD_DATE)\""
ifeq ($(shell echo "check_quotes"),"check_quotes")
# windows
INTEL_COMPVERSION := $(shell ..\..\Utilities\Scripts\intel_compversion)
INTELMPI_COMPVERSION := $(shell ..\..\Utilities\Scripts\intel_compversion)
GNU_COMPVERSION := $(shell ..\..\Utilities\Scripts\gnu_compversion)
else
# linux/osx
@@ -148,7 +148,7 @@ main.obj: FFLAGS += $(FOPENMPFLAGS)
impi_intel_win_64 : MPILIB = "$(I_MPI_ROOT)\intel64\lib\impi.lib"
impi_intel_win_64 : MPIINCLUDE = "$(I_MPI_ROOT)\intel64\include"
impi_intel_win_64 : FFLAGS = /Qipo /O2 /I$(MPIINCLUDE) /traceback /wrap-margin- $(GITINFO) $(INTEL_COMPINFO) $(FFLAGSMKL_INTEL)
impi_intel_win_64 : FFLAGS = /Qipo /O2 /I$(MPIINCLUDE) /traceback /wrap-margin- $(GITINFO) $(INTELMPI_COMPINFO) $(FFLAGSMKL_INTEL)
impi_intel_win_64 : FOPENMPFLAGS = /Qopenmp
impi_intel_win_64 : FCOMPL = ifort
impi_intel_win_64 : obj = fds_mpi_win_64
@@ -157,7 +157,7 @@ impi_intel_win_64 : setup_win $(objwin_mpi)
impi_intel_win_64_dv : MPILIB = "$(I_MPI_ROOT)\intel64\lib\impi.lib"
impi_intel_win_64_dv : MPIINCLUDE = "$(I_MPI_ROOT)\intel64\include"
impi_intel_win_64_dv : FFLAGS = /O1 /I$(MPIINCLUDE) /traceback /wrap-margin- $(GITINFO) $(INTEL_COMPINFO) $(FFLAGSMKL_INTEL)
impi_intel_win_64_dv : FFLAGS = /O1 /I$(MPIINCLUDE) /traceback /wrap-margin- $(GITINFO) $(INTELMPI_COMPINFO) $(FFLAGSMKL_INTEL)
impi_intel_win_64_dv : FOPENMPFLAGS = /Qopenmp
impi_intel_win_64_dv : FCOMPL = ifort
impi_intel_win_64_dv : obj = fds_mpi_win_64_dv
@@ -166,7 +166,7 @@ impi_intel_win_64_dv : setup_win $(objwin_mpi)
impi_intel_win_64_db : MPILIB = "$(I_MPI_ROOT)\intel64\lib\impi.lib"
impi_intel_win_64_db : MPIINCLUDE = "$(I_MPI_ROOT)\intel64\include"
impi_intel_win_64_db : FFLAGS = /Od /nologo /debug:all /I$(MPIINCLUDE) /Z7 /extend_source:132 /warn:unused /warn:nointerfaces /Qtrapuv /fp:strict /fp:except /traceback /check:all /stand:f08 /wrap-margin- $(GITINFO) $(INTEL_COMPINFO) $(FFLAGSMKL_INTEL)
impi_intel_win_64_db : FFLAGS = /Od /nologo /debug:all /I$(MPIINCLUDE) /Z7 /extend_source:132 /warn:unused /warn:nointerfaces /Qtrapuv /fp:strict /fp:except /traceback /check:all /stand:f08 /wrap-margin- $(GITINFO) $(INTELMPI_COMPINFO) $(FFLAGSMKL_INTEL)
impi_intel_win_64_db : FOPENMPFLAGS = /Qopenmp
impi_intel_win_64_db : FCOMPL = ifort
impi_intel_win_64_db : obj = fds_mpi_win_64_db

0 comments on commit a02cde3

Please sign in to comment.