From 47e62f81150247062b229133b3b403d2e5f5df5e Mon Sep 17 00:00:00 2001 From: Marc Pfetsch Date: Fri, 5 Jan 2024 18:30:29 +0100 Subject: [PATCH] quadmath is often included via lapack on linux, sometimes not needed --- make/make.scipsdpproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make/make.scipsdpproj b/make/make.scipsdpproj index 3c33b4cc..4ecb045c 100644 --- a/make/make.scipsdpproj +++ b/make/make.scipsdpproj @@ -190,10 +190,10 @@ else BLASLIB = -lblas -llapack endif ifeq ($(MUMPSSEQ),true) -MUMPSLIB = -ldmumps_seq -lmumps_common_seq -lpord -lmpiseq -lquadmath +MUMPSLIB = -ldmumps_seq -lmumps_common_seq -lpord -lmpiseq SDPILIB = -L$(SCIPSDPLIBDIR)/$(LIBEXTTYPE) -lsdpa $(MUMPSLIB) $(BLASLIB) -Wl,-rpath,$(SCIPSDPLIBDIR)/static -lgfortran -lpthread -fPIC else -MUMPSLIB = -ldmumps -lmumps_common -lpord -lmpiseq -lquadmath #-lgomp -fopenmp +MUMPSLIB = -ldmumps -lmumps_common -lpord -lmpiseq #-lgomp -fopenmp SDPILIB = -L$(SCIPSDPLIBDIR)/$(LIBEXTTYPE) -lsdpa $(MUMPSLIB) $(BLASLIB) -lpthread -Wl,-rpath,$(SCIPSDPLIBDIR)/static -lgfortran -fPIC # pthread after (openblas) endif endif @@ -209,9 +209,9 @@ BDYNAMIC = -Wl,-Bdynamic endif endif ifeq ($(OPENBLAS),true) -SDPILIB = -m$(BITEXT) -L$(SCIPSDPLIBDIR)/shared -lmosek$(BITEXT) -Wl,-rpath,$(dir $(realpath $(SCIPSDPLIBDIR)/shared/libmosek$(BITEXT).$(SHAREDLIBEXT))) $(BSTATIC) -lc $(BDYNAMIC) -lopenblas -lquadmath -pthread -lgfortran -lm #-lgomp +SDPILIB = -m$(BITEXT) -L$(SCIPSDPLIBDIR)/shared -lmosek$(BITEXT) -Wl,-rpath,$(dir $(realpath $(SCIPSDPLIBDIR)/shared/libmosek$(BITEXT).$(SHAREDLIBEXT))) $(BSTATIC) -lc $(BDYNAMIC) -lopenblas -pthread -lgfortran -lm #-lgomp else -SDPILIB = -m$(BITEXT) -L$(SCIPSDPLIBDIR)/shared -lmosek$(BITEXT) -Wl,-rpath,$(dir $(realpath $(SCIPSDPLIBDIR)/shared/libmosek$(BITEXT).$(SHAREDLIBEXT))) $(BSTATIC) -llapack -lblas -lc $(BDYNAMIC) -lquadmath -pthread -lgfortran -lm +SDPILIB = -m$(BITEXT) -L$(SCIPSDPLIBDIR)/shared -lmosek$(BITEXT) -Wl,-rpath,$(dir $(realpath $(SCIPSDPLIBDIR)/shared/libmosek$(BITEXT).$(SHAREDLIBEXT))) $(BSTATIC) -llapack -lblas -lc $(BDYNAMIC) -pthread -lgfortran -lm endif endif