Changeset 971 for trunk


Ignore:
Timestamp:
Jun 27, 2013 5:19:33 PM (6 years ago)
Author:
tkr
Message:

Changes for embedding manifest

Location:
trunk/Couenne
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/configure

    r970 r971  
    2420224202    echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
    2420324203echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
    24204     if "$PKG_CONFIG" --atleast-pkgconfig-version $_pkg_min_version; then
     24204    if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
    2420524205      echo "$as_me:$LINENO: result: yes" >&5
    2420624206echo "${ECHO_T}yes" >&6
     
    2421424214  # check if pkg-config supports the short-errors flag
    2421524215  if test -n "$PKG_CONFIG" && \
    24216     "$PKG_CONFIG" --atleast-pkgconfig-version 0.20; then
     24216    $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
    2421724217    pkg_short_errors=" --short-errors "
    2421824218  else
     
    2442824428
    2442924429if test -n "$PKG_CONFIG" ; then
    24430   if "$PKG_CONFIG" --exists "bonmin"; then
    24431     BONMIN_VERSIONS=`"$PKG_CONFIG" --modversion "bonmin" 2>/dev/null | tr '\n' ' '`
    24432      cflags=`"$PKG_CONFIG" --cflags "bonmin" 2>/dev/null`
     24430  if $PKG_CONFIG --exists "bonmin"; then
     24431    BONMIN_VERSIONS=`$PKG_CONFIG --modversion "bonmin" 2>/dev/null | tr '\n' ' '`
     24432     cflags=`$PKG_CONFIG --cflags "bonmin" 2>/dev/null`
    2443324433    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2443424434        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2443924439    fi
    2444024440    BONMIN_CFLAGS="$cflags"
    24441     BONMIN_LIBS=`"$PKG_CONFIG" --libs "bonmin" 2>/dev/null`
    24442     BONMIN_DATA=`"$PKG_CONFIG" --variable=datadir "bonmin" 2>/dev/null`
     24441    BONMIN_LIBS=`$PKG_CONFIG --libs "bonmin" 2>/dev/null`
     24442    BONMIN_DATA=`$PKG_CONFIG --variable=datadir "bonmin" 2>/dev/null`
    2444324443     coin_has_bonmin=yes
    2444424444        echo "$as_me:$LINENO: result: yes: $BONMIN_VERSIONS" >&5
     
    2446224462
    2446324463  else
    24464     BONMIN_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "bonmin"`
     24464    BONMIN_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "bonmin"`
    2446524465      coin_has_bonmin=notGiven
    2446624466        echo "$as_me:$LINENO: result: not given: $BONMIN_PKG_ERRORS" >&5
     
    2450824508allpcfiles=""
    2450924509allpcifiles=""
    24510 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    24511 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2451224510while test "x$projtoprocess" != x ; do
    2451324511
     
    2495324951
    2495424952if test -n "$PKG_CONFIG" ; then
    24955   if "$PKG_CONFIG" --exists "bonminamplinterface"; then
    24956     ASL_VERSIONS=`"$PKG_CONFIG" --modversion "bonminamplinterface" 2>/dev/null | tr '\n' ' '`
    24957      cflags=`"$PKG_CONFIG" --cflags "bonminamplinterface" 2>/dev/null`
     24953  if $PKG_CONFIG --exists "bonminamplinterface"; then
     24954    ASL_VERSIONS=`$PKG_CONFIG --modversion "bonminamplinterface" 2>/dev/null | tr '\n' ' '`
     24955     cflags=`$PKG_CONFIG --cflags "bonminamplinterface" 2>/dev/null`
    2495824956    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2495924957        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2496424962    fi
    2496524963    ASL_CFLAGS="$cflags"
    24966     ASL_LIBS=`"$PKG_CONFIG" --libs "bonminamplinterface" 2>/dev/null`
    24967     ASL_DATA=`"$PKG_CONFIG" --variable=datadir "bonminamplinterface" 2>/dev/null`
     24964    ASL_LIBS=`$PKG_CONFIG --libs "bonminamplinterface" 2>/dev/null`
     24965    ASL_DATA=`$PKG_CONFIG --variable=datadir "bonminamplinterface" 2>/dev/null`
    2496824966     coin_has_asl=yes
    2496924967        echo "$as_me:$LINENO: result: yes: $ASL_VERSIONS" >&5
     
    2498724985
    2498824986  else
    24989     ASL_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "bonminamplinterface"`
     24987    ASL_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "bonminamplinterface"`
    2499024988      coin_has_asl=notGiven
    2499124989        echo "$as_me:$LINENO: result: not given: $ASL_PKG_ERRORS" >&5
     
    2503325031allpcfiles=""
    2503425032allpcifiles=""
    25035 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    25036 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2503725033while test "x$projtoprocess" != x ; do
    2503825034
     
    2568625682
    2568725683if test -n "$PKG_CONFIG" ; then
    25688   if "$PKG_CONFIG" --exists "coinscip"; then
    25689     SCIP_VERSIONS=`"$PKG_CONFIG" --modversion "coinscip" 2>/dev/null | tr '\n' ' '`
    25690      cflags=`"$PKG_CONFIG" --cflags "coinscip" 2>/dev/null`
     25684  if $PKG_CONFIG --exists "coinscip"; then
     25685    SCIP_VERSIONS=`$PKG_CONFIG --modversion "coinscip" 2>/dev/null | tr '\n' ' '`
     25686     cflags=`$PKG_CONFIG --cflags "coinscip" 2>/dev/null`
    2569125687    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2569225688        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2569725693    fi
    2569825694    SCIP_CFLAGS="$cflags"
    25699     SCIP_LIBS=`"$PKG_CONFIG" --libs "coinscip" 2>/dev/null`
    25700     SCIP_DATA=`"$PKG_CONFIG" --variable=datadir "coinscip" 2>/dev/null`
     25695    SCIP_LIBS=`$PKG_CONFIG --libs "coinscip" 2>/dev/null`
     25696    SCIP_DATA=`$PKG_CONFIG --variable=datadir "coinscip" 2>/dev/null`
    2570125697     coin_has_scip=yes
    2570225698        echo "$as_me:$LINENO: result: yes: $SCIP_VERSIONS" >&5
     
    2572025716
    2572125717  else
    25722     SCIP_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "coinscip"`
     25718    SCIP_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coinscip"`
    2572325719      coin_has_scip=notGiven
    2572425720        echo "$as_me:$LINENO: result: not given: $SCIP_PKG_ERRORS" >&5
     
    2576625762allpcfiles=""
    2576725763allpcifiles=""
    25768 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    25769 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2577025764while test "x$projtoprocess" != x ; do
    2577125765
     
    2620126195
    2620226196if test -n "$PKG_CONFIG" ; then
    26203   if "$PKG_CONFIG" --exists "osi-cplex"; then
    26204     CPX_VERSIONS=`"$PKG_CONFIG" --modversion "osi-cplex" 2>/dev/null | tr '\n' ' '`
    26205      cflags=`"$PKG_CONFIG" --cflags "osi-cplex" 2>/dev/null`
     26197  if $PKG_CONFIG --exists "osi-cplex"; then
     26198    CPX_VERSIONS=`$PKG_CONFIG --modversion "osi-cplex" 2>/dev/null | tr '\n' ' '`
     26199     cflags=`$PKG_CONFIG --cflags "osi-cplex" 2>/dev/null`
    2620626200    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2620726201        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2621226206    fi
    2621326207    CPX_CFLAGS="$cflags"
    26214     CPX_LIBS=`"$PKG_CONFIG" --libs "osi-cplex" 2>/dev/null`
    26215     CPX_DATA=`"$PKG_CONFIG" --variable=datadir "osi-cplex" 2>/dev/null`
     26208    CPX_LIBS=`$PKG_CONFIG --libs "osi-cplex" 2>/dev/null`
     26209    CPX_DATA=`$PKG_CONFIG --variable=datadir "osi-cplex" 2>/dev/null`
    2621626210     coin_has_cpx=yes
    2621726211        echo "$as_me:$LINENO: result: yes: $CPX_VERSIONS" >&5
     
    2623526229
    2623626230  else
    26237     CPX_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-cplex"`
     26231    CPX_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-cplex"`
    2623826232      coin_has_cpx=notGiven
    2623926233        echo "$as_me:$LINENO: result: not given: $CPX_PKG_ERRORS" >&5
     
    2628126275allpcfiles=""
    2628226276allpcifiles=""
    26283 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    26284 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2628526277while test "x$projtoprocess" != x ; do
    2628626278
     
    2672326715
    2672426716if test -n "$PKG_CONFIG" ; then
    26725   if "$PKG_CONFIG" --exists "osi-gurobi"; then
    26726     GRB_VERSIONS=`"$PKG_CONFIG" --modversion "osi-gurobi" 2>/dev/null | tr '\n' ' '`
    26727      cflags=`"$PKG_CONFIG" --cflags "osi-gurobi" 2>/dev/null`
     26717  if $PKG_CONFIG --exists "osi-gurobi"; then
     26718    GRB_VERSIONS=`$PKG_CONFIG --modversion "osi-gurobi" 2>/dev/null | tr '\n' ' '`
     26719     cflags=`$PKG_CONFIG --cflags "osi-gurobi" 2>/dev/null`
    2672826720    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2672926721        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2673426726    fi
    2673526727    GRB_CFLAGS="$cflags"
    26736     GRB_LIBS=`"$PKG_CONFIG" --libs "osi-gurobi" 2>/dev/null`
    26737     GRB_DATA=`"$PKG_CONFIG" --variable=datadir "osi-gurobi" 2>/dev/null`
     26728    GRB_LIBS=`$PKG_CONFIG --libs "osi-gurobi" 2>/dev/null`
     26729    GRB_DATA=`$PKG_CONFIG --variable=datadir "osi-gurobi" 2>/dev/null`
    2673826730     coin_has_grb=yes
    2673926731        echo "$as_me:$LINENO: result: yes: $GRB_VERSIONS" >&5
     
    2675726749
    2675826750  else
    26759     GRB_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-gurobi"`
     26751    GRB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-gurobi"`
    2676026752      coin_has_grb=notGiven
    2676126753        echo "$as_me:$LINENO: result: not given: $GRB_PKG_ERRORS" >&5
     
    2680326795allpcfiles=""
    2680426796allpcifiles=""
    26805 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    26806 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2680726797while test "x$projtoprocess" != x ; do
    2680826798
     
    2723627226
    2723727227if test -n "$PKG_CONFIG" ; then
    27238   if "$PKG_CONFIG" --exists "osi-mosek"; then
    27239     MSK_VERSIONS=`"$PKG_CONFIG" --modversion "osi-mosek" 2>/dev/null | tr '\n' ' '`
    27240      cflags=`"$PKG_CONFIG" --cflags "osi-mosek" 2>/dev/null`
     27228  if $PKG_CONFIG --exists "osi-mosek"; then
     27229    MSK_VERSIONS=`$PKG_CONFIG --modversion "osi-mosek" 2>/dev/null | tr '\n' ' '`
     27230     cflags=`$PKG_CONFIG --cflags "osi-mosek" 2>/dev/null`
    2724127231    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2724227232        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2724727237    fi
    2724827238    MSK_CFLAGS="$cflags"
    27249     MSK_LIBS=`"$PKG_CONFIG" --libs "osi-mosek" 2>/dev/null`
    27250     MSK_DATA=`"$PKG_CONFIG" --variable=datadir "osi-mosek" 2>/dev/null`
     27239    MSK_LIBS=`$PKG_CONFIG --libs "osi-mosek" 2>/dev/null`
     27240    MSK_DATA=`$PKG_CONFIG --variable=datadir "osi-mosek" 2>/dev/null`
    2725127241     coin_has_msk=yes
    2725227242        echo "$as_me:$LINENO: result: yes: $MSK_VERSIONS" >&5
     
    2727027260
    2727127261  else
    27272     MSK_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-mosek"`
     27262    MSK_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-mosek"`
    2727327263      coin_has_msk=notGiven
    2727427264        echo "$as_me:$LINENO: result: not given: $MSK_PKG_ERRORS" >&5
     
    2731627306allpcfiles=""
    2731727307allpcifiles=""
    27318 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    27319 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2732027308while test "x$projtoprocess" != x ; do
    2732127309
     
    2774927737
    2775027738if test -n "$PKG_CONFIG" ; then
    27751   if "$PKG_CONFIG" --exists "osi-soplex"; then
    27752     SPX_VERSIONS=`"$PKG_CONFIG" --modversion "osi-soplex" 2>/dev/null | tr '\n' ' '`
    27753      cflags=`"$PKG_CONFIG" --cflags "osi-soplex" 2>/dev/null`
     27739  if $PKG_CONFIG --exists "osi-soplex"; then
     27740    SPX_VERSIONS=`$PKG_CONFIG --modversion "osi-soplex" 2>/dev/null | tr '\n' ' '`
     27741     cflags=`$PKG_CONFIG --cflags "osi-soplex" 2>/dev/null`
    2775427742    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2775527743        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2776027748    fi
    2776127749    SPX_CFLAGS="$cflags"
    27762     SPX_LIBS=`"$PKG_CONFIG" --libs "osi-soplex" 2>/dev/null`
    27763     SPX_DATA=`"$PKG_CONFIG" --variable=datadir "osi-soplex" 2>/dev/null`
     27750    SPX_LIBS=`$PKG_CONFIG --libs "osi-soplex" 2>/dev/null`
     27751    SPX_DATA=`$PKG_CONFIG --variable=datadir "osi-soplex" 2>/dev/null`
    2776427752     coin_has_spx=yes
    2776527753        echo "$as_me:$LINENO: result: yes: $SPX_VERSIONS" >&5
     
    2778327771
    2778427772  else
    27785     SPX_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-soplex"`
     27773    SPX_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-soplex"`
    2778627774      coin_has_spx=notGiven
    2778727775        echo "$as_me:$LINENO: result: not given: $SPX_PKG_ERRORS" >&5
     
    2782927817allpcfiles=""
    2783027818allpcifiles=""
    27831 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    27832 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2783327819while test "x$projtoprocess" != x ; do
    2783427820
     
    2826228248
    2826328249if test -n "$PKG_CONFIG" ; then
    28264   if "$PKG_CONFIG" --exists "osi-xpress"; then
    28265     XPR_VERSIONS=`"$PKG_CONFIG" --modversion "osi-xpress" 2>/dev/null | tr '\n' ' '`
    28266      cflags=`"$PKG_CONFIG" --cflags "osi-xpress" 2>/dev/null`
     28250  if $PKG_CONFIG --exists "osi-xpress"; then
     28251    XPR_VERSIONS=`$PKG_CONFIG --modversion "osi-xpress" 2>/dev/null | tr '\n' ' '`
     28252     cflags=`$PKG_CONFIG --cflags "osi-xpress" 2>/dev/null`
    2826728253    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2826828254        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2827328259    fi
    2827428260    XPR_CFLAGS="$cflags"
    28275     XPR_LIBS=`"$PKG_CONFIG" --libs "osi-xpress" 2>/dev/null`
    28276     XPR_DATA=`"$PKG_CONFIG" --variable=datadir "osi-xpress" 2>/dev/null`
     28261    XPR_LIBS=`$PKG_CONFIG --libs "osi-xpress" 2>/dev/null`
     28262    XPR_DATA=`$PKG_CONFIG --variable=datadir "osi-xpress" 2>/dev/null`
    2827728263     coin_has_xpr=yes
    2827828264        echo "$as_me:$LINENO: result: yes: $XPR_VERSIONS" >&5
     
    2829628282
    2829728283  else
    28298     XPR_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-xpress"`
     28284    XPR_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-xpress"`
    2829928285      coin_has_xpr=notGiven
    2830028286        echo "$as_me:$LINENO: result: not given: $XPR_PKG_ERRORS" >&5
     
    2834228328allpcfiles=""
    2834328329allpcifiles=""
    28344 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    28345 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2834628330while test "x$projtoprocess" != x ; do
    2834728331
  • trunk/Couenne/src/main/Makefile.am

    r970 r971  
    5959
    6060install-exec-hook:
    61         test -s couenne.exe.manifest && \
    62         mt -manifest couenne.exe.manifest -outputresource:couenne.exe;\
    63         cp couenne.exe $(bindir)/couenne.exe
     61        if COIN_CXX_IS_CL
     62                test -s couenne.exe.manifest && \
     63                mt -manifest couenne.exe.manifest -outputresource:couenne.exe;\
     64                cp couenne.exe $(bindir)/couenne.exe
     65        endif
    6466
  • trunk/Couenne/src/main/Makefile.in

    r970 r971  
    674674
    675675install-exec-hook:
    676         test -s couenne.exe.manifest && \
    677         mt -manifest couenne.exe.manifest -outputresource:couenne.exe;\
    678         cp couenne.exe $(bindir)/couenne.exe
     676        if COIN_CXX_IS_CL
     677                test -s couenne.exe.manifest && \
     678                mt -manifest couenne.exe.manifest -outputresource:couenne.exe;\
     679                cp couenne.exe $(bindir)/couenne.exe
     680        endif
    679681# Tell versions [3.59,3.63) of GNU make to not export all variables.
    680682# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.