Changeset 27977

Timestamp:

10/30/23 10:04:43 (17 months ago)

Author:

jdquinn

Message:

BUG: Fix for Windows binaries

File:

• issm/trunk-jpl/src/c/Makefile.am (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -717 +717 @@
 libISSMCore_la_FFLAGS = $(AM_FFLAGS)
 
+libISSMCore_LIB_ADD = $(CHACOLIB) $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(MPLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(ADJOINTMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) 
+if FORTRAN
+libISSMCore_LIB_ADD += $(FLIBS) $(FORTRANLIB)
+endif
+libISSMCore_LIB_ADD += $(OSLIBS)
+
+if MSYS2
+libISSMCore_la_LIBADD = ${libISSMCore_LIB_ADD}
+else
 if !STANDALONE_LIBRARIES
-libISSMCore_la_LIBADD = $(CHACOLIB) $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(MPLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(ADJOINTMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) 
-if FORTRAN
-libISSMCore_la_LIBADD += $(FLIBS) $(FORTRANLIB)
-endif
-libISSMCore_la_LIBADD += $(OSLIBS)
+libISSMCore_la_LIBADD = ${libISSMCore_LIB_ADD}
+endif
 endif