223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

now having libraries from Makefile before PETSc Libraries in linker order

This commit is contained in:
Martin Diehl 2012-11-08 18:26:10 +00:00
parent 1df9be233d
commit 6a86f36407
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/Makefile
View File

@ -96,14 +96,6 @@ endif
LIBRARIES +=-lfftw3 LIBRARIES +=-lfftw3
LIB_DIRS +=-L$(FFTWROOT)/lib LIB_DIRS +=-L$(FFTWROOT)/lib
ifeq "$(SOLVER)" "NEW"
ifdef PETSC_DIR
include ${PETSC_DIR}/conf/variables
INCLUDE_DIRS +=${PETSC_FC_INCLUDES} -DPETSc
LIBRARIES +=${PETSC_WITH_EXTERNAL_LIB}
endif
endif
ifdef IMKLROOT ifdef IMKLROOT
LIB_DIRS +=-L$(IMKLROOT)/lib/intel64 LIB_DIRS +=-L$(IMKLROOT)/lib/intel64
LIBRARIES +=-mkl LIBRARIES +=-mkl
@ -119,6 +111,14 @@ endif
endif endif
endif endif
ifeq "$(SOLVER)" "NEW"
ifdef PETSC_DIR
include ${PETSC_DIR}/conf/variables
INCLUDE_DIRS +=${PETSC_FC_INCLUDES} -DPETSc
LIBRARIES +=${PETSC_WITH_EXTERNAL_LIB}
endif
endif
ifdef STANDARD_CHECK ifdef STANDARD_CHECK
STANDARD_CHECK_ifort =$(STANDARD_CHECK) STANDARD_CHECK_ifort =$(STANDARD_CHECK)
STANDARD_CHECK_gfortran =$(STANDARD_CHECK) STANDARD_CHECK_gfortran =$(STANDARD_CHECK)