Changeset 2656


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

fix disabling scip-threadsafe and corresponding warning message

Location:
ThirdParty/SCIP/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/SCIP/trunk/configure

    r2643 r2656  
    2349023490
    2349123491else
    23492   if test $scip_threadsafe = auto ; then
    23493                   { { echo "$as_me:$LINENO: error: --enable-cbc-parallel selected, but -lpthreads unavailable" >&5
    23494 echo "$as_me: error: --enable-cbc-parallel selected, but -lpthreads unavailable" >&2;}
     23492  if test $scip_threadsafe = yes ; then
     23493                  { { echo "$as_me:$LINENO: error: --scip-threadsafe selected, but -lpthreads unavailable" >&5
     23494echo "$as_me: error: --scip-threadsafe selected, but -lpthreads unavailable" >&2;}
    2349523495   { (exit 1); exit 1; }; }
    2349623496                else
  • ThirdParty/SCIP/trunk/configure.ac

    r2643 r2656  
    203203                SCIPLIB_PCLIBS="-lpthread $SCIPLIB_PCLIBS"
    204204               ],
    205                [if test $scip_threadsafe = auto ; then
    206                   AC_MSG_ERROR([--enable-cbc-parallel selected, but -lpthreads unavailable])
     205               [if test $scip_threadsafe = yes ; then
     206                  AC_MSG_ERROR([--scip-threadsafe selected, but -lpthreads unavailable])
    207207                else
    208208                  AC_MSG_NOTICE([no pthreads, SCIP will not be threadsafe])
Note: See TracChangeset for help on using the changeset viewer.