Changeset 3915


Ignore:
Timestamp:
Nov 20, 2018 6:26:19 AM (20 months ago)
Author:
stefan
Message:

adjust to changed macro names in SCIP 6.0 bugfix branch

Location:
ThirdParty/SCIP/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/SCIP/trunk/coinscip-uninstalled.pc.in

    r2713 r3915  
    77Version: @PACKAGE_VERSION@
    88Libs: ${libdir}/libcoinscip.la ${libdir}/libcoinsciplpis.la @SCIPLIB_PCLIBS@
    9 Cflags: -I@abs_source_dir@ -I@abs_source_dir@/scip/src
     9Cflags: -I@abs_source_dir@ -I@abs_source_dir@/scip/src -DNO_CONFIG_HEADER
    1010Requires: @SCIPLIB_PCREQUIRES@
  • ThirdParty/SCIP/trunk/coinscip.pc.in

    r2713 r3915  
    99Version: @PACKAGE_VERSION@
    1010Libs: -L${libdir} -lcoinscip -lcoinsciplpis @SCIPLIB_PCLIBS@
    11 Cflags: -I${includedir}
     11Cflags: -I${includedir} -DNO_CONFIG_HEADER
    1212Requires: @SCIPLIB_PCREQUIRES@
  • ThirdParty/SCIP/trunk/configure

    r3833 r3915  
    2334023340#############################################################################
    2334123341
    23342 EXTRAFLAGS="-DWITH_SCIPDEF"
     23342EXTRAFLAGS="-DWITH_SCIPDEF -DNO_CONFIG_HEADER"
    2334323343
    2334423344# Check whether --enable-scip-threadsafe or --disable-scip-threadsafe was given.
     
    2371023710
    2371123711if test $coin_has_zlib = "yes"; then
    23712   EXTRAFLAGS="$EXTRAFLAGS -DWITH_ZLIB"
     23712  EXTRAFLAGS="$EXTRAFLAGS -DWITH_ZLIB -DSCIP_WITH_ZLIB"
    2371323713fi
    2371423714
     
    2396923969
    2397023970if test $coin_has_gmp = yes; then
    23971   EXTRAFLAGS="$EXTRAFLAGS -DWITH_GMP"
     23971  EXTRAFLAGS="$EXTRAFLAGS -DWITH_GMP -DSCIP_WITH_GMP"
    2397223972fi
    2397323973
     
    2428224282
    2428324283if test $coin_has_readline = yes; then
    24284   EXTRAFLAGS="$EXTRAFLAGS -DWITH_READLINE"
     24284  EXTRAFLAGS="$EXTRAFLAGS -DWITH_READLINE -DSCIP_WITH_READLINE"
    2428524285fi
    2428624286
     
    2439124391  :
    2439224392else
    24393   EXTRAFLAGS="$EXTRAFLAGS -DNO_SIGACTION"
     24393  EXTRAFLAGS="$EXTRAFLAGS -DNO_SIGACTION -DSCIP_NO_SIGACTION"
    2439424394fi
    2439524395
     
    2458524585  :
    2458624586else
    24587   EXTRAFLAGS="$EXTRAFLAGS -DNO_STRTOK_R"
     24587  EXTRAFLAGS="$EXTRAFLAGS -DNO_STRTOK_R -DSCIP_NO_STRTOK_R"
    2458824588fi
    2458924589
     
    2482424824fi
    2482524825if test $ac_cv_header_fenv_h = yes; then
    24826   EXTRAFLAGS="$EXTRAFLAGS -DROUNDING_FE"
     24826  EXTRAFLAGS="$EXTRAFLAGS -DSCIP_ROUNDING_FE"
    2482724827else
    2482824828  if test "${ac_cv_header_float_h+set}" = set; then
     
    2496424964fi
    2496524965if test $ac_cv_header_float_h = yes; then
    24966   EXTRAFLAGS="$EXTRAFLAGS -DROUNDING_MS"
     24966  EXTRAFLAGS="$EXTRAFLAGS -DSCIP_ROUNDING_MS"
    2496724967fi
    2496824968
  • ThirdParty/SCIP/trunk/configure.ac

    r3833 r3915  
    167167#############################################################################
    168168
    169 EXTRAFLAGS="-DWITH_SCIPDEF"
     169EXTRAFLAGS="-DWITH_SCIPDEF -DNO_CONFIG_HEADER"
    170170
    171171AC_ARG_ENABLE([scip-threadsafe],
     
    192192AC_COIN_CHECK_GNU_ZLIB(SCIPlib)
    193193if test $coin_has_zlib = "yes"; then
    194   EXTRAFLAGS="$EXTRAFLAGS -DWITH_ZLIB
     194  EXTRAFLAGS="$EXTRAFLAGS -DWITH_ZLIB -DSCIP_WITH_ZLIB
    195195fi
    196196
    197197AC_COIN_CHECK_GMP(SCIPLib)
    198198if test $coin_has_gmp = yes; then
    199   EXTRAFLAGS="$EXTRAFLAGS -DWITH_GMP
     199  EXTRAFLAGS="$EXTRAFLAGS -DWITH_GMP -DSCIP_WITH_GMP
    200200fi
    201201
    202202AC_COIN_CHECK_GNU_READLINE(SCIPLib)
    203203if test $coin_has_readline = yes; then
    204   EXTRAFLAGS="$EXTRAFLAGS -DWITH_READLINE
     204  EXTRAFLAGS="$EXTRAFLAGS -DWITH_READLINE -DSCIP_WITH_READLINE"
    205205fi
    206206
    207207AC_CHECK_MEMBER(struct sigaction.sa_handler,,
    208   [EXTRAFLAGS="$EXTRAFLAGS -DNO_SIGACTION"],
     208  [EXTRAFLAGS="$EXTRAFLAGS -DNO_SIGACTION -DSCIP_NO_SIGACTION"],
    209209  [#include <signal.h>])
    210210   
     
    213213   
    214214AC_CHECK_FUNC(strtok_r,,
    215   [EXTRAFLAGS="$EXTRAFLAGS -DNO_STRTOK_R"])
     215  [EXTRAFLAGS="$EXTRAFLAGS -DNO_STRTOK_R -DSCIP_NO_STRTOK_R"])
    216216
    217217AC_CHECK_FUNC(strerror_r,,
    218218  [EXTRAFLAGS="$EXTRAFLAGS -DNO_STRERROR_R"])
    219219   
    220 AC_CHECK_HEADER([fenv.h],[EXTRAFLAGS="$EXTRAFLAGS -DROUNDING_FE"],
    221   [AC_CHECK_HEADER([float.h],[EXTRAFLAGS="$EXTRAFLAGS -DROUNDING_MS"])])
     220AC_CHECK_HEADER([fenv.h],[EXTRAFLAGS="$EXTRAFLAGS -DSCIP_ROUNDING_FE"],
     221  [AC_CHECK_HEADER([float.h],[EXTRAFLAGS="$EXTRAFLAGS -DSCIP_ROUNDING_MS"])])
    222222
    223223# check if user specifies bliss
Note: See TracChangeset for help on using the changeset viewer.