Skip to content

Commit

Permalink
check for ASL again to locate asl.h, for #41
Browse files Browse the repository at this point in the history
  • Loading branch information
@svigerske
svigerske committed Apr 1, 2023
1 parent bcfa4ef commit b09c0e5
Show file tree
Hide file tree
Showing 20 changed files with 714 additions and 30 deletions.
9 changes: 9 additions & 0 deletions Bonmin/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -170,6 +177,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
592 changes: 564 additions & 28 deletions Bonmin/configure
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Bonmin/configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ if test $coin_has_coindepend != yes ; then
fi

AC_COIN_CHECK_PACKAGE(IpoptAmpl, [ipoptamplinterface], [BonminAmplInterfaceLib])
AC_COIN_CHECK_PACKAGE(ASL, [coinasl], [BonminAmplInterfaceLib])

#AC_COIN_CHECK_PACKAGE(Bcp, [bcp])
#
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/experimental/RobotBonmin/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -138,6 +145,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/experimental/Separable/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -139,6 +146,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/src/Algorithms/Ampl/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -140,6 +147,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/src/Algorithms/Branching/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -142,6 +149,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/src/Algorithms/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -151,6 +158,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/src/Algorithms/OaGenerators/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -146,6 +153,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/src/Algorithms/QuadCuts/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -142,6 +149,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/src/Apps/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -127,6 +134,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/src/CbcBonmin/Heuristics/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -146,6 +153,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/src/CbcBonmin/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -169,6 +176,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
2 changes: 1 addition & 1 deletion Bonmin/src/Interfaces/Ampl/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ libbonamplinterface_la_LDFLAGS = $(LT_LDFLAGS)
AM_CPPFLAGS = \
-I`$(CYGPATH_W) $(srcdir)/..` \
-I`$(CYGPATH_W) $(srcdir)/../Ipopt` \
$(BONMINLIB_CFLAGS) $(IPOPTAMPL_CFLAGS)
$(BONMINLIB_CFLAGS) $(IPOPTAMPL_CFLAGS) $(ASL_CFLAGS)

if COIN_HAS_FILTERSQP
AM_CPPFLAGS += -I`$(CYGPATH_W) $(srcdir)/../Filter`
Expand Down
11 changes: 10 additions & 1 deletion Bonmin/src/Interfaces/Ampl/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -142,6 +149,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down Expand Up @@ -335,7 +344,7 @@ libbonamplinterface_la_LDFLAGS = $(LT_LDFLAGS)
# "cygpath" stuff is necessary to compile with native compilers on Windows
AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
$(srcdir)/../Ipopt` $(BONMINLIB_CFLAGS) $(IPOPTAMPL_CFLAGS) \
$(am__append_1)
$(ASL_CFLAGS) $(am__append_1)

# This line is necessary to allow VPATH compilation
DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/src/Interfaces/Filter/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -145,6 +152,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/src/Interfaces/Ipopt/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -141,6 +148,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
9 changes: 9 additions & 0 deletions Bonmin/src/Interfaces/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,13 @@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
ASL_CFLAGS = @ASL_CFLAGS@
ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
ASL_DATA = @ASL_DATA@
ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
ASL_LIBS = @ASL_LIBS@
ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
ASTYLE = @ASTYLE@
ASTYLEFLAGS = @ASTYLEFLAGS@
AUTOCONF = @AUTOCONF@
Expand Down Expand Up @@ -156,6 +163,8 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
Expand Down
3 changes: 3 additions & 0 deletions Bonmin/src/Interfaces/config.h.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
/* Define to the debug verbosity level (0 is no output) */
#undef COIN_BONMIN_VERBOSITY

/* Define to 1 if the ASL package is available */
#undef COIN_HAS_ASL

/* Define to 1 if the CoinDepend package is available */
#undef COIN_HAS_COINDEPEND

Expand Down
Loading

0 comments on commit b09c0e5

Please sign in to comment.