restore OpenBLAS-specific build file fixes
This commit is contained in:
parent
56d238ff0f
commit
884e6da73b
|
@ -98,7 +98,8 @@ set(ZEIGTST zchkee.F
|
|||
|
||||
macro(add_eig_executable name)
|
||||
add_executable(${name} ${ARGN})
|
||||
target_link_libraries(${name} ${TMGLIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
|
||||
target_link_libraries(${name} openblas${SUFFIX64_UNDERSCORE})
|
||||
#${TMGLIB} ../${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
|
||||
endmacro()
|
||||
|
||||
if(BUILD_SINGLE)
|
||||
|
|
|
@ -128,16 +128,16 @@ double: xeigtstd
|
|||
complex16: xeigtstz
|
||||
|
||||
xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) $(TMGLIB) ../$(LAPACKLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST) $(TMGLIB) ../$(LAPACKLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST) $(TMGLIB) ../$(LAPACKLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST) $(TMGLIB) ../$(LAPACKLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
$(AEIGTST): $(FRC)
|
||||
$(SCIGTST): $(FRC)
|
||||
|
|
|
@ -239,7 +239,8 @@ set(ZLINTSTRFP zchkrfp.f zdrvrfp.f zdrvrf1.f zdrvrf2.f zdrvrf3.f zdrvrf4.f zerrr
|
|||
|
||||
macro(add_lin_executable name)
|
||||
add_executable(${name} ${ARGN})
|
||||
target_link_libraries(${name} ${TMGLIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
|
||||
target_link_libraries(${name} openblas${SUFFIX64_UNDERSCORE})
|
||||
#${TMGLIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
|
||||
endmacro()
|
||||
|
||||
if(BUILD_SINGLE)
|
||||
|
|
|
@ -270,34 +270,34 @@ proto-complex: xlintstrfc
|
|||
proto-complex16: xlintstzc xlintstrfz
|
||||
|
||||
xlintsts: $(ALINTST) $(SLINTST) $(SCLNTST) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
xlintstc: $(ALINTST) $(CLINTST) $(SCLNTST) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
xlintstd: $(ALINTST) $(DLINTST) $(DZLNTST) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
xlintstz: $(ALINTST) $(ZLINTST) $(DZLNTST) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
xlintstds: $(DSLINTST) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
xlintstzc: $(ZCLINTST) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
xlintstrfs: $(SLINTSTRFP) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
xlintstrfd: $(DLINTSTRFP) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
xlintstrfc: $(CLINTSTRFP) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
xlintstrfz: $(ZLINTSTRFP) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(BLASLIB)
|
||||
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^
|
||||
|
||||
$(ALINTST): $(FRC)
|
||||
$(SCLNTST): $(FRC)
|
||||
|
|
|
@ -106,5 +106,10 @@ cleanobj:
|
|||
cleanlib:
|
||||
rm -f $(TMGLIB)
|
||||
|
||||
ifneq ($(C_LAPACK), 1)
|
||||
slaran.o: slaran.f ; $(FC) $(FFLAGS_NOOPT) -c -o $@ $<
|
||||
dlaran.o: dlaran.f ; $(FC) $(FFLAGS_NOOPT) -c -o $@ $<
|
||||
else
|
||||
slaran.o: slaran.c ; $(CC) $(CFLAGS_NOOPT) -c -o $@ $<
|
||||
dlaran.o: dlaran.c ; $(CC) $(CFLAGS_NOOPT) -c -o $@ $<
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue