Skip to content

Commit

Permalink
temporarily committing release candidate
Browse files Browse the repository at this point in the history
  • Loading branch information
svigerske committed Jan 31, 2020
1 parent 1eae02c commit 227e005
Show file tree
Hide file tree
Showing 11 changed files with 127 additions and 46 deletions.
1 change: 1 addition & 0 deletions Clp/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
coin_have_doxygen = @coin_have_doxygen@
coin_have_latex = @coin_have_latex@
datadir = @datadir@
dos2unix = @dos2unix@
exec_prefix = @exec_prefix@
have_autoconf = @have_autoconf@
have_automake = @have_automake@
Expand Down
72 changes: 55 additions & 17 deletions Clp/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for Clp 1.17.
# Generated by GNU Autoconf 2.59 for Clp 1.17.4.
#
# Report bugs to <clp@list.coin-or.org>.
#
Expand Down Expand Up @@ -429,8 +429,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='Clp'
PACKAGE_TARNAME='clp'
PACKAGE_VERSION='1.17'
PACKAGE_STRING='Clp 1.17'
PACKAGE_VERSION='1.17.4'
PACKAGE_STRING='Clp 1.17.4'
PACKAGE_BUGREPORT='clp@list.coin-or.org'

ac_unique_file="src/ClpSimplex.cpp"
Expand Down Expand Up @@ -472,7 +472,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"

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 build build_cpu build_vendor build_os ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CLP_SVN_REV 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 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 DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA COINUTILS_DEPENDENCIES COINUTILS_LIBS_INSTALLED COINUTILS_CFLAGS_INSTALLED COINUTILS_DATA_INSTALLED CLPLIB_CFLAGS CLPLIB_LIBS CLPLIB_PCLIBS CLPLIB_PCREQUIRES CLPLIB_DEPENDENCIES CLPLIB_CFLAGS_INSTALLED CLPLIB_LIBS_INSTALLED COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA OSI_DEPENDENCIES OSI_LIBS_INSTALLED OSI_CFLAGS_INSTALLED OSI_DATA_INSTALLED OSICLPLIB_CFLAGS OSICLPLIB_LIBS OSICLPLIB_PCLIBS OSICLPLIB_PCREQUIRES OSICLPLIB_DEPENDENCIES OSICLPLIB_CFLAGS_INSTALLED OSICLPLIB_LIBS_INSTALLED COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA OSITESTS_DEPENDENCIES OSITESTS_LIBS_INSTALLED OSITESTS_CFLAGS_INSTALLED OSITESTS_DATA_INSTALLED COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA SAMPLE_DEPENDENCIES SAMPLE_LIBS_INSTALLED SAMPLE_CFLAGS_INSTALLED SAMPLE_DATA_INSTALLED COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA NETLIB_DEPENDENCIES NETLIB_LIBS_INSTALLED NETLIB_CFLAGS_INSTALLED NETLIB_DATA_INSTALLED COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE COIN_HAS_ABC_TRUE COIN_HAS_ABC_FALSE AMDINCDIR AMDLIB COIN_HAS_AMD_TRUE COIN_HAS_AMD_FALSE CHOLMODINCDIR CHOLMODLIB COIN_HAS_CHOLMOD_TRUE COIN_HAS_CHOLMOD_FALSE GLPK_LIBS GLPK_CFLAGS GLPK_DATA GLPK_DEPENDENCIES GLPK_LIBS_INSTALLED GLPK_CFLAGS_INSTALLED GLPK_DATA_INSTALLED COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE MUMPS_LIBS MUMPS_CFLAGS MUMPS_DATA MUMPS_DEPENDENCIES MUMPS_LIBS_INSTALLED MUMPS_CFLAGS_INSTALLED MUMPS_DATA_INSTALLED COIN_HAS_MUMPS_TRUE COIN_HAS_MUMPS_FALSE ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS MPIF77 FLIBS BLAS_LIBS BLAS_CFLAGS BLAS_DATA BLAS_DEPENDENCIES BLAS_LIBS_INSTALLED BLAS_CFLAGS_INSTALLED BLAS_DATA_INSTALLED COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE COIN_HAS_WSMP_TRUE COIN_HAS_WSMP_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA ASL_DEPENDENCIES ASL_LIBS_INSTALLED ASL_CFLAGS_INSTALLED ASL_DATA_INSTALLED COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE coin_have_doxygen coin_have_latex coin_doxy_usedot coin_doxy_tagname coin_doxy_logname COIN_HAS_DOXYGEN_TRUE COIN_HAS_DOXYGEN_FALSE COIN_HAS_LATEX_TRUE COIN_HAS_LATEX_FALSE coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
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 build build_cpu build_vendor build_os ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CLP_SVN_REV 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 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 dos2unix RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA COINUTILS_DEPENDENCIES COINUTILS_LIBS_INSTALLED COINUTILS_CFLAGS_INSTALLED COINUTILS_DATA_INSTALLED CLPLIB_CFLAGS CLPLIB_LIBS CLPLIB_PCLIBS CLPLIB_PCREQUIRES CLPLIB_DEPENDENCIES CLPLIB_CFLAGS_INSTALLED CLPLIB_LIBS_INSTALLED COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA OSI_DEPENDENCIES OSI_LIBS_INSTALLED OSI_CFLAGS_INSTALLED OSI_DATA_INSTALLED OSICLPLIB_CFLAGS OSICLPLIB_LIBS OSICLPLIB_PCLIBS OSICLPLIB_PCREQUIRES OSICLPLIB_DEPENDENCIES OSICLPLIB_CFLAGS_INSTALLED OSICLPLIB_LIBS_INSTALLED COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA OSITESTS_DEPENDENCIES OSITESTS_LIBS_INSTALLED OSITESTS_CFLAGS_INSTALLED OSITESTS_DATA_INSTALLED COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA SAMPLE_DEPENDENCIES SAMPLE_LIBS_INSTALLED SAMPLE_CFLAGS_INSTALLED SAMPLE_DATA_INSTALLED COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA NETLIB_DEPENDENCIES NETLIB_LIBS_INSTALLED NETLIB_CFLAGS_INSTALLED NETLIB_DATA_INSTALLED COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE COIN_HAS_ABC_TRUE COIN_HAS_ABC_FALSE AMDINCDIR AMDLIB COIN_HAS_AMD_TRUE COIN_HAS_AMD_FALSE CHOLMODINCDIR CHOLMODLIB COIN_HAS_CHOLMOD_TRUE COIN_HAS_CHOLMOD_FALSE GLPK_LIBS GLPK_CFLAGS GLPK_DATA GLPK_DEPENDENCIES GLPK_LIBS_INSTALLED GLPK_CFLAGS_INSTALLED GLPK_DATA_INSTALLED COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE MUMPS_LIBS MUMPS_CFLAGS MUMPS_DATA MUMPS_DEPENDENCIES MUMPS_LIBS_INSTALLED MUMPS_CFLAGS_INSTALLED MUMPS_DATA_INSTALLED COIN_HAS_MUMPS_TRUE COIN_HAS_MUMPS_FALSE ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS MPIF77 FLIBS BLAS_LIBS BLAS_CFLAGS BLAS_DATA BLAS_DEPENDENCIES BLAS_LIBS_INSTALLED BLAS_CFLAGS_INSTALLED BLAS_DATA_INSTALLED COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE COIN_HAS_WSMP_TRUE COIN_HAS_WSMP_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA ASL_DEPENDENCIES ASL_LIBS_INSTALLED ASL_CFLAGS_INSTALLED ASL_DATA_INSTALLED COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE coin_have_doxygen coin_have_latex coin_doxy_usedot coin_doxy_tagname coin_doxy_logname COIN_HAS_DOXYGEN_TRUE COIN_HAS_DOXYGEN_FALSE COIN_HAS_LATEX_TRUE COIN_HAS_LATEX_FALSE coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
ac_subst_files=''

# Initialize some variables set by options.
Expand Down Expand Up @@ -1021,7 +1021,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Clp 1.17 to adapt to many kinds of systems.
\`configure' configures Clp 1.17.4 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1087,7 +1087,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Clp 1.17:";;
short | recursive ) echo "Configuration of Clp 1.17.4:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1308,7 +1308,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
Clp configure 1.17
Clp configure 1.17.4
generated by GNU Autoconf 2.59

Copyright (C) 2003 Free Software Foundation, Inc.
Expand All @@ -1328,7 +1328,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by Clp $as_me 1.17, which was
It was created by Clp $as_me 1.17.4, which was
generated by GNU Autoconf 2.59. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -1854,7 +1854,7 @@ _ACEOF


# Capture libtool library version, if given.

coin_libversion=15:4:14



Expand Down Expand Up @@ -4561,7 +4561,7 @@ fi

# Define the identity of the package.
PACKAGE='clp'
VERSION='1.17'
VERSION='1.17.4'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -5280,7 +5280,7 @@ if test x$prefix = xNONE; then
else
full_prefix=$prefix
fi
full_prefix=`cd $full_prefix ; pwd`


abs_lib_dir=$full_prefix/lib

Expand Down Expand Up @@ -20262,7 +20262,44 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'

{ echo "$as_me:$LINENO: Build is \"$build\"." >&5
echo "$as_me: Build is \"$build\"." >&6;}
mydos2unix='| dos2unix'
# Extract the first word of "dos2unix", so it can be a program name with args.
set dummy dos2unix; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_dos2unix+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$dos2unix"; then
ac_cv_prog_dos2unix="$dos2unix" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_dos2unix="dos2unix"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done

fi
fi
dos2unix=$ac_cv_prog_dos2unix
if test -n "$dos2unix"; then
echo "$as_me:$LINENO: result: $dos2unix" >&5
echo "${ECHO_T}$dos2unix" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi

if test "$dos2unix" = dos2unix ; then
mydos2unix="| dos2unix"
fi
case $build in
*-mingw*)
CYGPATH_W=echo
Expand Down Expand Up @@ -24922,7 +24959,7 @@ fi


# Provide some information about the compiler.
echo "$as_me:24925:" \
echo "$as_me:24962:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
Expand Down Expand Up @@ -25435,7 +25472,7 @@ _ACEOF
# flags.
ac_save_FFLAGS=$FFLAGS
FFLAGS="$FFLAGS $ac_verb"
(eval echo $as_me:25438: \"$ac_link\") >&5
(eval echo $as_me:25475: \"$ac_link\") >&5
ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_f77_v_output" >&5
FFLAGS=$ac_save_FFLAGS
Expand Down Expand Up @@ -25513,7 +25550,7 @@ _ACEOF
# flags.
ac_save_FFLAGS=$FFLAGS
FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
(eval echo $as_me:25516: \"$ac_link\") >&5
(eval echo $as_me:25553: \"$ac_link\") >&5
ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_f77_v_output" >&5
FFLAGS=$ac_save_FFLAGS
Expand Down Expand Up @@ -32918,7 +32955,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF

This file was extended by Clp $as_me 1.17, which was
This file was extended by Clp $as_me 1.17.4, which was
generated by GNU Autoconf 2.59. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -32981,7 +33018,7 @@ _ACEOF

cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
Clp config.status 1.17
Clp config.status 1.17.4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

Expand Down Expand Up @@ -33290,6 +33327,7 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
s,@ac_c_preproc_warn_flag@,$ac_c_preproc_warn_flag,;t t
s,@ac_cxx_preproc_warn_flag@,$ac_cxx_preproc_warn_flag,;t t
s,@dos2unix@,$dos2unix,;t t
s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
s,@DEPENDENCY_LINKING_TRUE@,$DEPENDENCY_LINKING_TRUE,;t t
s,@DEPENDENCY_LINKING_FALSE@,$DEPENDENCY_LINKING_FALSE,;t t
Expand Down
4 changes: 2 additions & 2 deletions Clp/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

AC_PREREQ(2.59)

AC_INIT([Clp],[1.17],[clp@list.coin-or.org])
AC_INIT([Clp],[1.17.4],[clp@list.coin-or.org])

AC_COPYRIGHT([
Copyright 2006 International Business Machines and others.
Expand Down Expand Up @@ -41,7 +41,7 @@ AC_CANONICAL_BUILD
# the source root directory contains definition of where to find those
# externals. The following macro ensures that those externals are
# retrieved by svn if they are not there yet.
AC_COIN_PROJECTDIR_INIT(Clp)
AC_COIN_PROJECTDIR_INIT(Clp,15:4:14)

# Check if user wants to produce debugging code
AC_COIN_DEBUG_COMPILE(Clp)
Expand Down
1 change: 1 addition & 0 deletions Clp/src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
coin_have_doxygen = @coin_have_doxygen@
coin_have_latex = @coin_have_latex@
datadir = @datadir@
dos2unix = @dos2unix@
exec_prefix = @exec_prefix@
have_autoconf = @have_autoconf@
have_automake = @have_automake@
Expand Down
1 change: 1 addition & 0 deletions Clp/src/OsiClp/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
coin_have_doxygen = @coin_have_doxygen@
coin_have_latex = @coin_have_latex@
datadir = @datadir@
dos2unix = @dos2unix@
exec_prefix = @exec_prefix@
have_autoconf = @have_autoconf@
have_automake = @have_automake@
Expand Down
4 changes: 2 additions & 2 deletions Clp/src/config_clp_default.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/***************************************************************************/

/* Version number of project */
#define CLP_VERSION "1.17"
#define CLP_VERSION "1.17.4"

/* Major Version number of project */
#define CLP_VERSION_MAJOR 1
Expand All @@ -14,7 +14,7 @@
#define CLP_VERSION_MINOR 17

/* Release Version number of project */
#define CLP_VERSION_RELEASE 9999
#define CLP_VERSION_RELEASE 4

/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
*/
1 change: 1 addition & 0 deletions Clp/test/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
coin_have_doxygen = @coin_have_doxygen@
coin_have_latex = @coin_have_latex@
datadir = @datadir@
dos2unix = @dos2unix@
exec_prefix = @exec_prefix@
have_autoconf = @have_autoconf@
have_automake = @have_automake@
Expand Down
22 changes: 11 additions & 11 deletions Dependencies
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
BuildTools https://projects.coin-or.org/svn/BuildTools/stable/0.8
ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.4
ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
ThirdParty/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.6
ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
Data/Netlib https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
Data/Sample https://projects.coin-or.org/svn/Data/Sample/stable/1.2
CoinUtils https://projects.coin-or.org/svn/CoinUtils/stable/2.11/CoinUtils
Osi https://projects.coin-or.org/svn/Osi/stable/0.108/Osi
BuildTools https://projects.coin-or.org/svn/BuildTools/releases/0.8.10/
ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.4.2/
ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.4.8/
ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.6.1/
ThirdParty/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.3.9/
ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.6.2/
ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.10.7/
Data/Netlib https://projects.coin-or.org/svn/Data/Netlib/releases/1.2.9/
Data/Sample https://projects.coin-or.org/svn/Data/Sample/releases/1.2.12/
CoinUtils https://projects.coin-or.org/svn/CoinUtils/releases/2.11.4/CoinUtils
Osi https://projects.coin-or.org/svn/Osi/releases/0.108.6/Osi
1 change: 1 addition & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
coin_have_doxygen = @coin_have_doxygen@
coin_have_latex = @coin_have_latex@
datadir = @datadir@
dos2unix = @dos2unix@
exec_prefix = @exec_prefix@
have_autoconf = @have_autoconf@
have_automake = @have_automake@
Expand Down
Loading

0 comments on commit 227e005

Please sign in to comment.