Skip to content

Commit

Permalink
Always compile with ipopt
Browse files Browse the repository at this point in the history
  • Loading branch information
sjoelund committed Nov 17, 2015
1 parent 44ea7be commit 13983f6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Compiler/runtime/config.unix.h.in
Expand Up @@ -45,7 +45,7 @@
/* Skip compiling against some stuff for the JavaScript runtime */
#if !defined(OMC_EMCC) && !defined(OMC_MINIMAL_RUNTIME)
@WITH_SUNDIALS@
@WITH_IPOPT@
#define WITH_IPOPT
@WITH_UMFPACK@
@WITH_HWLOC@
#endif
Expand Down
18 changes: 1 addition & 17 deletions configure.ac
Expand Up @@ -49,7 +49,6 @@ AC_SUBST(MAKE)
AC_SUBST(LD_LAPACK)
AC_SUBST(NO_LAPACK)
AC_SUBST(WITH_SUNDIALS)
AC_SUBST(WITH_IPOPT)
AC_SUBST(WITH_UMFPACK)
AC_SUBST(UMFPACK_TARGET)
AC_SUBST(UMFPACK_LDFLAGS)
Expand Down Expand Up @@ -610,22 +609,7 @@ AC_CHECK_LIB(pthread,pthread_self,[RT_LDFLAGS="$RT_LDFLAGS $LIBS"],[AC_MSG_ERROR

LIBS=""

AC_ARG_WITH(ipopt, [ --without-ipopt Disable compilation ipopt], [
if test "$withval" = "no"; then
NO_IPOPT=yes
fi
]
],[])
if ! test "$NO_IPOPT" = "yes"; then
FINAL_MESSAGES="$FINAL_MESSAGES\nSimulations may use IPOPT: Yes"
WITH_IPOPT="#define WITH_IPOPT"
IPOPT_LDFLAGS="-lipopt -lcoinmumps"
else
FINAL_MESSAGES="$FINAL_MESSAGES\nSimulations may use IPOPT: No"
WITH_IPOPT="/* Without IPOPT */"
IPOPT_CFLAGS=""
IPOPT_LDFLAGS=""
fi
IPOPT_LDFLAGS="-lipopt -lcoinmumps"

# check for umfpack
AC_ARG_WITH(UMFPACK, [ --without-UMFPACK Disable compilation with UMFPACK, a sparse linear systems solver],
Expand Down

0 comments on commit 13983f6

Please sign in to comment.