Changeset 2657


Ignore:
Timestamp:
Nov 28, 2012 1:52:15 PM (7 years ago)
Author:
stefan
Message:

tell soplex users that soplex has been build with gmp support, if so

Location:
ThirdParty/SoPlex/stable/1.2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/SoPlex/stable/1.2/Makefile.in

    r2582 r2657  
    218218SOPLEX_PCLIBS = @SOPLEX_PCLIBS@
    219219SOPLEX_SVN_REV = @SOPLEX_SVN_REV@
     220SOPLEX_WITH_GMP_CFLAG = @SOPLEX_WITH_GMP_CFLAG@
    220221STRIP = @STRIP@
    221222VERSION = @VERSION@
  • ThirdParty/SoPlex/stable/1.2/coinsoplex-uninstalled.pc.in

    r2212 r2657  
    77Version: @PACKAGE_VERSION@
    88Libs: ${libdir}/libcoinsoplex.la @SOPLEX_PCLIBS@
    9 Cflags: -I@abs_source_dir@/soplex/src
     9Cflags: -I@abs_source_dir@/soplex/src @SOPLEX_WITH_GMP_CFLAG@
  • ThirdParty/SoPlex/stable/1.2/coinsoplex.pc.in

    r2212 r2657  
    99Version: @PACKAGE_VERSION@
    1010Libs: -L${libdir} -lcoinsoplex @SOPLEX_PCLIBS@
    11 Cflags: -I${includedir}
     11Cflags: -I${includedir} @SOPLEX_WITH_GMP_CFLAG@
  • ThirdParty/SoPlex/stable/1.2/configure

    r2653 r2657  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion SOPLEX_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE SOPLEX_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion SOPLEX_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE SOPLEX_WITH_GMP_CFLAG SOPLEX_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2103921039fi
    2104021040
     21041SOPLEX_WITH_GMP_CFLAG=
    2104121042
    2104221043
     
    2134021341  echo "$as_me:$LINENO: result: yes" >&5
    2134121342echo "${ECHO_T}yes" >&6
    21342      CXXFLAGS="$CXXFLAGS -DSOPLEX_WITH_GMP"
     21343     SOPLEX_WITH_GMP_CFLAG=-DSOPLEX_WITH_GMP
     21344     CXXFLAGS="$CXXFLAGS $SOPLEX_WITH_GMP_CFLAG"
    2134321345     SOPLEX_LIBS="-lgmpxx -lgmp $SOPLEX_LIBS"
    2134421346     SOPLEX_PCLIBS="-lgmpxx -lgmp $SOPLEX_PCLIBS"
     
    2136321365
    2136421366fi
     21367
    2136521368
    2136621369###########################################################################
     
    2224822251s,@COIN_HAS_ZLIB_TRUE@,$COIN_HAS_ZLIB_TRUE,;t t
    2224922252s,@COIN_HAS_ZLIB_FALSE@,$COIN_HAS_ZLIB_FALSE,;t t
     22253s,@SOPLEX_WITH_GMP_CFLAG@,$SOPLEX_WITH_GMP_CFLAG,;t t
    2225022254s,@SOPLEX_PCLIBS@,$SOPLEX_PCLIBS,;t t
    2225122255s,@LIBEXT@,$LIBEXT,;t t
  • ThirdParty/SoPlex/stable/1.2/configure.ac

    r2653 r2657  
    6262fi
    6363
     64SOPLEX_WITH_GMP_CFLAG=
    6465AC_COIN_CHECK_GMP
    6566if test $coin_has_gmp = yes; then
     
    7172    [AC_LANG_PROGRAM([#include <gmpxx.h>],[mpq_class pq])],
    7273    [AC_MSG_RESULT(yes)
    73      CXXFLAGS="$CXXFLAGS -DSOPLEX_WITH_GMP"
     74     SOPLEX_WITH_GMP_CFLAG=-DSOPLEX_WITH_GMP
     75     CXXFLAGS="$CXXFLAGS $SOPLEX_WITH_GMP_CFLAG"
    7476     SOPLEX_LIBS="-lgmpxx -lgmp $SOPLEX_LIBS"
    7577     SOPLEX_PCLIBS="-lgmpxx -lgmp $SOPLEX_PCLIBS"
     
    8183  AC_LANG_POP(C++)
    8284fi
     85AC_SUBST(SOPLEX_WITH_GMP_CFLAG)
    8386
    8487###########################################################################
Note: See TracChangeset for help on using the changeset viewer.