Skip to content

Commit 49ab312

Browse files
tkralphstkralphs
committed
Add explicit check for Blas and Lapack to make --with-blas-lib and --with-lapack-lib work correctly
1 parent 5c9a9ee commit 49ab312

File tree

7 files changed

+7683
-698
lines changed

7 files changed

+7683
-698
lines changed

‎Clp/Makefile.in‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
189189
COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
190190
COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
191191
COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
192+
COIN_HAS_LAPACK_FALSE = @COIN_HAS_LAPACK_FALSE@
193+
COIN_HAS_LAPACK_TRUE = @COIN_HAS_LAPACK_TRUE@
192194
COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
193195
COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
194196
COIN_HAS_MUMPS_FALSE = @COIN_HAS_MUMPS_FALSE@
@@ -244,6 +246,13 @@ INSTALL_DATA = @INSTALL_DATA@
244246
INSTALL_PROGRAM = @INSTALL_PROGRAM@
245247
INSTALL_SCRIPT = @INSTALL_SCRIPT@
246248
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
249+
LAPACK_CFLAGS = @LAPACK_CFLAGS@
250+
LAPACK_CFLAGS_INSTALLED = @LAPACK_CFLAGS_INSTALLED@
251+
LAPACK_DATA = @LAPACK_DATA@
252+
LAPACK_DATA_INSTALLED = @LAPACK_DATA_INSTALLED@
253+
LAPACK_DEPENDENCIES = @LAPACK_DEPENDENCIES@
254+
LAPACK_LIBS = @LAPACK_LIBS@
255+
LAPACK_LIBS_INSTALLED = @LAPACK_LIBS_INSTALLED@
247256
LDFLAGS = @LDFLAGS@
248257
LIBEXT = @LIBEXT@
249258
LIBOBJS = @LIBOBJS@

‎Clp/configure‎

Lines changed: 7642 additions & 698 deletions
Large diffs are not rendered by default.

‎Clp/configure.ac‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ AC_COIN_INIT_AUTO_TOOLS
5656
# COIN-OR components #
5757
#############################################################################
5858

59+
AC_COIN_CHECK_PACKAGE_BLAS(ClpLib)
60+
AC_COIN_CHECK_PACKAGE_LAPACK(ClpLib)
5961
AC_COIN_CHECK_PACKAGE(CoinUtils, [coinutils], [ClpLib])
6062
if test $coin_has_coinutils != yes ; then
6163
AC_MSG_ERROR([Required package CoinUtils not available.])

‎Clp/src/Makefile.in‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
394394
COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
395395
COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
396396
COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
397+
COIN_HAS_LAPACK_FALSE = @COIN_HAS_LAPACK_FALSE@
398+
COIN_HAS_LAPACK_TRUE = @COIN_HAS_LAPACK_TRUE@
397399
COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
398400
COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
399401
COIN_HAS_MUMPS_FALSE = @COIN_HAS_MUMPS_FALSE@
@@ -449,6 +451,13 @@ INSTALL_DATA = @INSTALL_DATA@
449451
INSTALL_PROGRAM = @INSTALL_PROGRAM@
450452
INSTALL_SCRIPT = @INSTALL_SCRIPT@
451453
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
454+
LAPACK_CFLAGS = @LAPACK_CFLAGS@
455+
LAPACK_CFLAGS_INSTALLED = @LAPACK_CFLAGS_INSTALLED@
456+
LAPACK_DATA = @LAPACK_DATA@
457+
LAPACK_DATA_INSTALLED = @LAPACK_DATA_INSTALLED@
458+
LAPACK_DEPENDENCIES = @LAPACK_DEPENDENCIES@
459+
LAPACK_LIBS = @LAPACK_LIBS@
460+
LAPACK_LIBS_INSTALLED = @LAPACK_LIBS_INSTALLED@
452461
LDFLAGS = @LDFLAGS@
453462
LIBEXT = @LIBEXT@
454463
LIBOBJS = @LIBOBJS@

‎Clp/src/OsiClp/Makefile.in‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
168168
COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
169169
COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
170170
COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
171+
COIN_HAS_LAPACK_FALSE = @COIN_HAS_LAPACK_FALSE@
172+
COIN_HAS_LAPACK_TRUE = @COIN_HAS_LAPACK_TRUE@
171173
COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
172174
COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
173175
COIN_HAS_MUMPS_FALSE = @COIN_HAS_MUMPS_FALSE@
@@ -223,6 +225,13 @@ INSTALL_DATA = @INSTALL_DATA@
223225
INSTALL_PROGRAM = @INSTALL_PROGRAM@
224226
INSTALL_SCRIPT = @INSTALL_SCRIPT@
225227
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
228+
LAPACK_CFLAGS = @LAPACK_CFLAGS@
229+
LAPACK_CFLAGS_INSTALLED = @LAPACK_CFLAGS_INSTALLED@
230+
LAPACK_DATA = @LAPACK_DATA@
231+
LAPACK_DATA_INSTALLED = @LAPACK_DATA_INSTALLED@
232+
LAPACK_DEPENDENCIES = @LAPACK_DEPENDENCIES@
233+
LAPACK_LIBS = @LAPACK_LIBS@
234+
LAPACK_LIBS_INSTALLED = @LAPACK_LIBS_INSTALLED@
226235
LDFLAGS = @LDFLAGS@
227236
LIBEXT = @LIBEXT@
228237
LIBOBJS = @LIBOBJS@

‎Clp/src/config.h.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
/* Define to 1 if the Glpk package is available */
4343
#undef COIN_HAS_GLPK
4444

45+
/* If defined, the LAPACK Library is available. */
46+
#undef COIN_HAS_LAPACK
47+
4548
/* Define to 1 if the Mumps package is available */
4649
#undef COIN_HAS_MUMPS
4750

‎Clp/test/Makefile.in‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
156156
COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
157157
COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
158158
COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
159+
COIN_HAS_LAPACK_FALSE = @COIN_HAS_LAPACK_FALSE@
160+
COIN_HAS_LAPACK_TRUE = @COIN_HAS_LAPACK_TRUE@
159161
COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
160162
COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
161163
COIN_HAS_MUMPS_FALSE = @COIN_HAS_MUMPS_FALSE@
@@ -211,6 +213,13 @@ INSTALL_DATA = @INSTALL_DATA@
211213
INSTALL_PROGRAM = @INSTALL_PROGRAM@
212214
INSTALL_SCRIPT = @INSTALL_SCRIPT@
213215
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
216+
LAPACK_CFLAGS = @LAPACK_CFLAGS@
217+
LAPACK_CFLAGS_INSTALLED = @LAPACK_CFLAGS_INSTALLED@
218+
LAPACK_DATA = @LAPACK_DATA@
219+
LAPACK_DATA_INSTALLED = @LAPACK_DATA_INSTALLED@
220+
LAPACK_DEPENDENCIES = @LAPACK_DEPENDENCIES@
221+
LAPACK_LIBS = @LAPACK_LIBS@
222+
LAPACK_LIBS_INSTALLED = @LAPACK_LIBS_INSTALLED@
214223
LDFLAGS = @LDFLAGS@
215224
LIBEXT = @LIBEXT@
216225
LIBOBJS = @LIBOBJS@

0 commit comments

Comments
 (0)