Skip to content

Commit

Permalink
Merge pull request coin-or#2 from IDAES/master
Browse files Browse the repository at this point in the history
Fix sIPOPT linking problem
  • Loading branch information
John Eslick authored Feb 27, 2021
2 parents bf3a448 + 7e48cd7 commit 1559f5f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion contrib/sIPOPT/AmplSolver/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ bin_PROGRAMS = ipopt_sens
ipopt_sens_SOURCES = ampl_sipopt.cpp SensAmplTNLP.cpp

ipopt_sens_LDADD = ../src/libsipopt.la \
../../../src/Apps/AmplSolver/libipoptamplinterface.la
../../../src/Apps/AmplSolver/libipoptamplinterface.la \
$(SIPOPTAMPLINTERFACELIB_LFLAGS)

AM_LDFLAGS = $(LT_LDFLAGS)

Expand Down
6 changes: 4 additions & 2 deletions contrib/sIPOPT/AmplSolver/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ PROGRAMS = $(bin_PROGRAMS)
am_ipopt_sens_OBJECTS = ampl_sipopt.$(OBJEXT) SensAmplTNLP.$(OBJEXT)
ipopt_sens_OBJECTS = $(am_ipopt_sens_OBJECTS)
ipopt_sens_DEPENDENCIES = ../src/libsipopt.la \
../../../src/Apps/AmplSolver/libipoptamplinterface.la
../../../src/Apps/AmplSolver/libipoptamplinterface.la \
$(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
Expand Down Expand Up @@ -347,7 +348,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ipopt_sens_SOURCES = ampl_sipopt.cpp SensAmplTNLP.cpp
ipopt_sens_LDADD = ../src/libsipopt.la \
../../../src/Apps/AmplSolver/libipoptamplinterface.la
../../../src/Apps/AmplSolver/libipoptamplinterface.la \
$(SIPOPTAMPLINTERFACELIB_LFLAGS)

AM_LDFLAGS = $(LT_LDFLAGS)
AM_CPPFLAGS = \
Expand Down

0 comments on commit 1559f5f

Please sign in to comment.