Changeset 1934 for trunk/Cbc


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

Changes for embedding manifest

Location:
trunk/Cbc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure

    r1933 r1934  
    2092620926    echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
    2092720927echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
    20928     if "$PKG_CONFIG" --atleast-pkgconfig-version $_pkg_min_version; then
     20928    if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
    2092920929      echo "$as_me:$LINENO: result: yes" >&5
    2093020930echo "${ECHO_T}yes" >&6
     
    2093820938  # check if pkg-config supports the short-errors flag
    2093920939  if test -n "$PKG_CONFIG" && \
    20940     "$PKG_CONFIG" --atleast-pkgconfig-version 0.20; then
     20940    $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
    2094120941    pkg_short_errors=" --short-errors "
    2094220942  else
     
    2116321163
    2116421164if test -n "$PKG_CONFIG" ; then
    21165   if "$PKG_CONFIG" --exists "cgl osi coinutils"; then
    21166     COINDEPEND_VERSIONS=`"$PKG_CONFIG" --modversion "cgl osi coinutils" 2>/dev/null | tr '\n' ' '`
    21167      cflags=`"$PKG_CONFIG" --cflags "cgl osi coinutils" 2>/dev/null`
     21165  if $PKG_CONFIG --exists "cgl osi coinutils"; then
     21166    COINDEPEND_VERSIONS=`$PKG_CONFIG --modversion "cgl osi coinutils" 2>/dev/null | tr '\n' ' '`
     21167     cflags=`$PKG_CONFIG --cflags "cgl osi coinutils" 2>/dev/null`
    2116821168    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2116921169        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2117421174    fi
    2117521175    COINDEPEND_CFLAGS="$cflags"
    21176     COINDEPEND_LIBS=`"$PKG_CONFIG" --libs "cgl osi coinutils" 2>/dev/null`
    21177     COINDEPEND_DATA=`"$PKG_CONFIG" --variable=datadir "cgl osi coinutils" 2>/dev/null`
     21176    COINDEPEND_LIBS=`$PKG_CONFIG --libs "cgl osi coinutils" 2>/dev/null`
     21177    COINDEPEND_DATA=`$PKG_CONFIG --variable=datadir "cgl osi coinutils" 2>/dev/null`
    2117821178     coin_has_coindepend=yes
    2117921179        echo "$as_me:$LINENO: result: yes: $COINDEPEND_VERSIONS" >&5
     
    2120121201
    2120221202  else
    21203     COINDEPEND_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "cgl osi coinutils"`
     21203    COINDEPEND_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "cgl osi coinutils"`
    2120421204      coin_has_coindepend=notGiven
    2120521205        echo "$as_me:$LINENO: result: not given: $COINDEPEND_PKG_ERRORS" >&5
     
    2124721247allpcfiles=""
    2124821248allpcifiles=""
    21249 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    21250 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2125121249while test "x$projtoprocess" != x ; do
    2125221250
     
    2171421712
    2171521713if test -n "$PKG_CONFIG" ; then
    21716   if "$PKG_CONFIG" --exists "osi-clp"; then
    21717     CLP_VERSIONS=`"$PKG_CONFIG" --modversion "osi-clp" 2>/dev/null | tr '\n' ' '`
    21718      cflags=`"$PKG_CONFIG" --cflags "osi-clp" 2>/dev/null`
     21714  if $PKG_CONFIG --exists "osi-clp"; then
     21715    CLP_VERSIONS=`$PKG_CONFIG --modversion "osi-clp" 2>/dev/null | tr '\n' ' '`
     21716     cflags=`$PKG_CONFIG --cflags "osi-clp" 2>/dev/null`
    2171921717    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2172021718        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2172521723    fi
    2172621724    CLP_CFLAGS="$cflags"
    21727     CLP_LIBS=`"$PKG_CONFIG" --libs "osi-clp" 2>/dev/null`
    21728     CLP_DATA=`"$PKG_CONFIG" --variable=datadir "osi-clp" 2>/dev/null`
     21725    CLP_LIBS=`$PKG_CONFIG --libs "osi-clp" 2>/dev/null`
     21726    CLP_DATA=`$PKG_CONFIG --variable=datadir "osi-clp" 2>/dev/null`
    2172921727     coin_has_clp=yes
    2173021728        echo "$as_me:$LINENO: result: yes: $CLP_VERSIONS" >&5
     
    2175221750
    2175321751  else
    21754     CLP_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-clp"`
     21752    CLP_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-clp"`
    2175521753      coin_has_clp=notGiven
    2175621754        echo "$as_me:$LINENO: result: not given: $CLP_PKG_ERRORS" >&5
     
    2179821796allpcfiles=""
    2179921797allpcifiles=""
    21800 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    21801 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2180221798while test "x$projtoprocess" != x ; do
    2180321799
     
    2224322239
    2224422240if test -n "$PKG_CONFIG" ; then
    22245   if "$PKG_CONFIG" --exists "osi-unittests"; then
    22246     OSITESTS_VERSIONS=`"$PKG_CONFIG" --modversion "osi-unittests" 2>/dev/null | tr '\n' ' '`
    22247      cflags=`"$PKG_CONFIG" --cflags "osi-unittests" 2>/dev/null`
     22241  if $PKG_CONFIG --exists "osi-unittests"; then
     22242    OSITESTS_VERSIONS=`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null | tr '\n' ' '`
     22243     cflags=`$PKG_CONFIG --cflags "osi-unittests" 2>/dev/null`
    2224822244    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2224922245        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2225422250    fi
    2225522251    OSITESTS_CFLAGS="$cflags"
    22256     OSITESTS_LIBS=`"$PKG_CONFIG" --libs "osi-unittests" 2>/dev/null`
    22257     OSITESTS_DATA=`"$PKG_CONFIG" --variable=datadir "osi-unittests" 2>/dev/null`
     22252    OSITESTS_LIBS=`$PKG_CONFIG --libs "osi-unittests" 2>/dev/null`
     22253    OSITESTS_DATA=`$PKG_CONFIG --variable=datadir "osi-unittests" 2>/dev/null`
    2225822254     coin_has_ositests=yes
    2225922255        echo "$as_me:$LINENO: result: yes: $OSITESTS_VERSIONS" >&5
     
    2227322269
    2227422270  else
    22275     OSITESTS_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-unittests"`
     22271    OSITESTS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-unittests"`
    2227622272      coin_has_ositests=notGiven
    2227722273        echo "$as_me:$LINENO: result: not given: $OSITESTS_PKG_ERRORS" >&5
     
    2231922315allpcfiles=""
    2232022316allpcifiles=""
    22321 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    22322 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2232322317while test "x$projtoprocess" != x ; do
    2232422318
     
    2272622720
    2272722721if test -n "$PKG_CONFIG" ; then
    22728   if "$PKG_CONFIG" --exists "coindatasample"; then
    22729     SAMPLE_VERSIONS=`"$PKG_CONFIG" --modversion "coindatasample" 2>/dev/null | tr '\n' ' '`
    22730      cflags=`"$PKG_CONFIG" --cflags "coindatasample" 2>/dev/null`
     22722  if $PKG_CONFIG --exists "coindatasample"; then
     22723    SAMPLE_VERSIONS=`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null | tr '\n' ' '`
     22724     cflags=`$PKG_CONFIG --cflags "coindatasample" 2>/dev/null`
    2273122725    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2273222726        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2273722731    fi
    2273822732    SAMPLE_CFLAGS="$cflags"
    22739     SAMPLE_LIBS=`"$PKG_CONFIG" --libs "coindatasample" 2>/dev/null`
    22740     SAMPLE_DATA=`"$PKG_CONFIG" --variable=datadir "coindatasample" 2>/dev/null`
     22733    SAMPLE_LIBS=`$PKG_CONFIG --libs "coindatasample" 2>/dev/null`
     22734    SAMPLE_DATA=`$PKG_CONFIG --variable=datadir "coindatasample" 2>/dev/null`
    2274122735     coin_has_sample=yes
    2274222736        echo "$as_me:$LINENO: result: yes: $SAMPLE_VERSIONS" >&5
     
    2275622750
    2275722751  else
    22758     SAMPLE_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "coindatasample"`
     22752    SAMPLE_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coindatasample"`
    2275922753      coin_has_sample=notGiven
    2276022754        echo "$as_me:$LINENO: result: not given: $SAMPLE_PKG_ERRORS" >&5
     
    2280222796allpcfiles=""
    2280322797allpcifiles=""
    22804 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    22805 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2280622798while test "x$projtoprocess" != x ; do
    2280722799
     
    2320923201
    2321023202if test -n "$PKG_CONFIG" ; then
    23211   if "$PKG_CONFIG" --exists "coindatanetlib"; then
    23212     NETLIB_VERSIONS=`"$PKG_CONFIG" --modversion "coindatanetlib" 2>/dev/null | tr '\n' ' '`
    23213      cflags=`"$PKG_CONFIG" --cflags "coindatanetlib" 2>/dev/null`
     23203  if $PKG_CONFIG --exists "coindatanetlib"; then
     23204    NETLIB_VERSIONS=`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null | tr '\n' ' '`
     23205     cflags=`$PKG_CONFIG --cflags "coindatanetlib" 2>/dev/null`
    2321423206    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2321523207        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2322023212    fi
    2322123213    NETLIB_CFLAGS="$cflags"
    23222     NETLIB_LIBS=`"$PKG_CONFIG" --libs "coindatanetlib" 2>/dev/null`
    23223     NETLIB_DATA=`"$PKG_CONFIG" --variable=datadir "coindatanetlib" 2>/dev/null`
     23214    NETLIB_LIBS=`$PKG_CONFIG --libs "coindatanetlib" 2>/dev/null`
     23215    NETLIB_DATA=`$PKG_CONFIG --variable=datadir "coindatanetlib" 2>/dev/null`
    2322423216     coin_has_netlib=yes
    2322523217        echo "$as_me:$LINENO: result: yes: $NETLIB_VERSIONS" >&5
     
    2323923231
    2324023232  else
    23241     NETLIB_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "coindatanetlib"`
     23233    NETLIB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coindatanetlib"`
    2324223234      coin_has_netlib=notGiven
    2324323235        echo "$as_me:$LINENO: result: not given: $NETLIB_PKG_ERRORS" >&5
     
    2328523277allpcfiles=""
    2328623278allpcifiles=""
    23287 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    23288 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2328923279while test "x$projtoprocess" != x ; do
    2329023280
     
    2369223682
    2369323683if test -n "$PKG_CONFIG" ; then
    23694   if "$PKG_CONFIG" --exists "coindatamiplib3"; then
    23695     MIPLIB3_VERSIONS=`"$PKG_CONFIG" --modversion "coindatamiplib3" 2>/dev/null | tr '\n' ' '`
    23696      cflags=`"$PKG_CONFIG" --cflags "coindatamiplib3" 2>/dev/null`
     23684  if $PKG_CONFIG --exists "coindatamiplib3"; then
     23685    MIPLIB3_VERSIONS=`$PKG_CONFIG --modversion "coindatamiplib3" 2>/dev/null | tr '\n' ' '`
     23686     cflags=`$PKG_CONFIG --cflags "coindatamiplib3" 2>/dev/null`
    2369723687    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2369823688        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2370323693    fi
    2370423694    MIPLIB3_CFLAGS="$cflags"
    23705     MIPLIB3_LIBS=`"$PKG_CONFIG" --libs "coindatamiplib3" 2>/dev/null`
    23706     MIPLIB3_DATA=`"$PKG_CONFIG" --variable=datadir "coindatamiplib3" 2>/dev/null`
     23695    MIPLIB3_LIBS=`$PKG_CONFIG --libs "coindatamiplib3" 2>/dev/null`
     23696    MIPLIB3_DATA=`$PKG_CONFIG --variable=datadir "coindatamiplib3" 2>/dev/null`
    2370723697     coin_has_miplib3=yes
    2370823698        echo "$as_me:$LINENO: result: yes: $MIPLIB3_VERSIONS" >&5
     
    2372223712
    2372323713  else
    23724     MIPLIB3_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "coindatamiplib3"`
     23714    MIPLIB3_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coindatamiplib3"`
    2372523715      coin_has_miplib3=notGiven
    2372623716        echo "$as_me:$LINENO: result: not given: $MIPLIB3_PKG_ERRORS" >&5
     
    2376823758allpcfiles=""
    2376923759allpcifiles=""
    23770 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    23771 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2377223760while test "x$projtoprocess" != x ; do
    2377323761
     
    2549825486
    2549925487if test -n "$PKG_CONFIG" ; then
    25500   if "$PKG_CONFIG" --exists "osi-dylp"; then
    25501     DYLP_VERSIONS=`"$PKG_CONFIG" --modversion "osi-dylp" 2>/dev/null | tr '\n' ' '`
    25502      cflags=`"$PKG_CONFIG" --cflags "osi-dylp" 2>/dev/null`
     25488  if $PKG_CONFIG --exists "osi-dylp"; then
     25489    DYLP_VERSIONS=`$PKG_CONFIG --modversion "osi-dylp" 2>/dev/null | tr '\n' ' '`
     25490     cflags=`$PKG_CONFIG --cflags "osi-dylp" 2>/dev/null`
    2550325491    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2550425492        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2550925497    fi
    2551025498    DYLP_CFLAGS="$cflags"
    25511     DYLP_LIBS=`"$PKG_CONFIG" --libs "osi-dylp" 2>/dev/null`
    25512     DYLP_DATA=`"$PKG_CONFIG" --variable=datadir "osi-dylp" 2>/dev/null`
     25499    DYLP_LIBS=`$PKG_CONFIG --libs "osi-dylp" 2>/dev/null`
     25500    DYLP_DATA=`$PKG_CONFIG --variable=datadir "osi-dylp" 2>/dev/null`
    2551325501     coin_has_dylp=yes
    2551425502        echo "$as_me:$LINENO: result: yes: $DYLP_VERSIONS" >&5
     
    2553225520
    2553325521  else
    25534     DYLP_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-dylp"`
     25522    DYLP_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-dylp"`
    2553525523      coin_has_dylp=notGiven
    2553625524        echo "$as_me:$LINENO: result: not given: $DYLP_PKG_ERRORS" >&5
     
    2557825566allpcfiles=""
    2557925567allpcifiles=""
    25580 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    25581 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2558225568while test "x$projtoprocess" != x ; do
    2558325569
     
    2600025986
    2600125987if test -n "$PKG_CONFIG" ; then
    26002   if "$PKG_CONFIG" --exists "osi-vol"; then
    26003     VOL_VERSIONS=`"$PKG_CONFIG" --modversion "osi-vol" 2>/dev/null | tr '\n' ' '`
    26004      cflags=`"$PKG_CONFIG" --cflags "osi-vol" 2>/dev/null`
     25988  if $PKG_CONFIG --exists "osi-vol"; then
     25989    VOL_VERSIONS=`$PKG_CONFIG --modversion "osi-vol" 2>/dev/null | tr '\n' ' '`
     25990     cflags=`$PKG_CONFIG --cflags "osi-vol" 2>/dev/null`
    2600525991    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2600625992        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2601125997    fi
    2601225998    VOL_CFLAGS="$cflags"
    26013     VOL_LIBS=`"$PKG_CONFIG" --libs "osi-vol" 2>/dev/null`
    26014     VOL_DATA=`"$PKG_CONFIG" --variable=datadir "osi-vol" 2>/dev/null`
     25999    VOL_LIBS=`$PKG_CONFIG --libs "osi-vol" 2>/dev/null`
     26000    VOL_DATA=`$PKG_CONFIG --variable=datadir "osi-vol" 2>/dev/null`
    2601526001     coin_has_vol=yes
    2601626002        echo "$as_me:$LINENO: result: yes: $VOL_VERSIONS" >&5
     
    2603026016
    2603126017  else
    26032     VOL_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-vol"`
     26018    VOL_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-vol"`
    2603326019      coin_has_vol=notGiven
    2603426020        echo "$as_me:$LINENO: result: not given: $VOL_PKG_ERRORS" >&5
     
    2607626062allpcfiles=""
    2607726063allpcifiles=""
    26078 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    26079 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2608026064while test "x$projtoprocess" != x ; do
    2608126065
     
    2650526489
    2650626490if test -n "$PKG_CONFIG" ; then
    26507   if "$PKG_CONFIG" --exists "osi-cplex"; then
    26508     CPX_VERSIONS=`"$PKG_CONFIG" --modversion "osi-cplex" 2>/dev/null | tr '\n' ' '`
    26509      cflags=`"$PKG_CONFIG" --cflags "osi-cplex" 2>/dev/null`
     26491  if $PKG_CONFIG --exists "osi-cplex"; then
     26492    CPX_VERSIONS=`$PKG_CONFIG --modversion "osi-cplex" 2>/dev/null | tr '\n' ' '`
     26493     cflags=`$PKG_CONFIG --cflags "osi-cplex" 2>/dev/null`
    2651026494    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2651126495        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2651626500    fi
    2651726501    CPX_CFLAGS="$cflags"
    26518     CPX_LIBS=`"$PKG_CONFIG" --libs "osi-cplex" 2>/dev/null`
    26519     CPX_DATA=`"$PKG_CONFIG" --variable=datadir "osi-cplex" 2>/dev/null`
     26502    CPX_LIBS=`$PKG_CONFIG --libs "osi-cplex" 2>/dev/null`
     26503    CPX_DATA=`$PKG_CONFIG --variable=datadir "osi-cplex" 2>/dev/null`
    2652026504     coin_has_cpx=yes
    2652126505        echo "$as_me:$LINENO: result: yes: $CPX_VERSIONS" >&5
     
    2654326527
    2654426528  else
    26545     CPX_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-cplex"`
     26529    CPX_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-cplex"`
    2654626530      coin_has_cpx=notGiven
    2654726531        echo "$as_me:$LINENO: result: not given: $CPX_PKG_ERRORS" >&5
     
    2658926573allpcfiles=""
    2659026574allpcifiles=""
    26591 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    26592 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2659326575while test "x$projtoprocess" != x ; do
    2659426576
     
    2703727019
    2703827020if test -n "$PKG_CONFIG" ; then
    27039   if "$PKG_CONFIG" --exists "osi-glpk"; then
    27040     GLPK_VERSIONS=`"$PKG_CONFIG" --modversion "osi-glpk" 2>/dev/null | tr '\n' ' '`
    27041      cflags=`"$PKG_CONFIG" --cflags "osi-glpk" 2>/dev/null`
     27021  if $PKG_CONFIG --exists "osi-glpk"; then
     27022    GLPK_VERSIONS=`$PKG_CONFIG --modversion "osi-glpk" 2>/dev/null | tr '\n' ' '`
     27023     cflags=`$PKG_CONFIG --cflags "osi-glpk" 2>/dev/null`
    2704227024    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2704327025        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2704827030    fi
    2704927031    GLPK_CFLAGS="$cflags"
    27050     GLPK_LIBS=`"$PKG_CONFIG" --libs "osi-glpk" 2>/dev/null`
    27051     GLPK_DATA=`"$PKG_CONFIG" --variable=datadir "osi-glpk" 2>/dev/null`
     27032    GLPK_LIBS=`$PKG_CONFIG --libs "osi-glpk" 2>/dev/null`
     27033    GLPK_DATA=`$PKG_CONFIG --variable=datadir "osi-glpk" 2>/dev/null`
    2705227034     coin_has_glpk=yes
    2705327035        echo "$as_me:$LINENO: result: yes: $GLPK_VERSIONS" >&5
     
    2707127053
    2707227054  else
    27073     GLPK_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-glpk"`
     27055    GLPK_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-glpk"`
    2707427056      coin_has_glpk=notGiven
    2707527057        echo "$as_me:$LINENO: result: not given: $GLPK_PKG_ERRORS" >&5
     
    2711727099allpcfiles=""
    2711827100allpcifiles=""
    27119 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    27120 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2712127101while test "x$projtoprocess" != x ; do
    2712227102
     
    2753927519
    2754027520if test -n "$PKG_CONFIG" ; then
    27541   if "$PKG_CONFIG" --exists "osi-gurobi"; then
    27542     GRB_VERSIONS=`"$PKG_CONFIG" --modversion "osi-gurobi" 2>/dev/null | tr '\n' ' '`
    27543      cflags=`"$PKG_CONFIG" --cflags "osi-gurobi" 2>/dev/null`
     27521  if $PKG_CONFIG --exists "osi-gurobi"; then
     27522    GRB_VERSIONS=`$PKG_CONFIG --modversion "osi-gurobi" 2>/dev/null | tr '\n' ' '`
     27523     cflags=`$PKG_CONFIG --cflags "osi-gurobi" 2>/dev/null`
    2754427524    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2754527525        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2755027530    fi
    2755127531    GRB_CFLAGS="$cflags"
    27552     GRB_LIBS=`"$PKG_CONFIG" --libs "osi-gurobi" 2>/dev/null`
    27553     GRB_DATA=`"$PKG_CONFIG" --variable=datadir "osi-gurobi" 2>/dev/null`
     27532    GRB_LIBS=`$PKG_CONFIG --libs "osi-gurobi" 2>/dev/null`
     27533    GRB_DATA=`$PKG_CONFIG --variable=datadir "osi-gurobi" 2>/dev/null`
    2755427534     coin_has_grb=yes
    2755527535        echo "$as_me:$LINENO: result: yes: $GRB_VERSIONS" >&5
     
    2756927549
    2757027550  else
    27571     GRB_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-gurobi"`
     27551    GRB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-gurobi"`
    2757227552      coin_has_grb=notGiven
    2757327553        echo "$as_me:$LINENO: result: not given: $GRB_PKG_ERRORS" >&5
     
    2761527595allpcfiles=""
    2761627596allpcifiles=""
    27617 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    27618 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2761927597while test "x$projtoprocess" != x ; do
    2762027598
     
    2803328011
    2803428012if test -n "$PKG_CONFIG" ; then
    28035   if "$PKG_CONFIG" --exists "osi-mosek"; then
    28036     MSK_VERSIONS=`"$PKG_CONFIG" --modversion "osi-mosek" 2>/dev/null | tr '\n' ' '`
    28037      cflags=`"$PKG_CONFIG" --cflags "osi-mosek" 2>/dev/null`
     28013  if $PKG_CONFIG --exists "osi-mosek"; then
     28014    MSK_VERSIONS=`$PKG_CONFIG --modversion "osi-mosek" 2>/dev/null | tr '\n' ' '`
     28015     cflags=`$PKG_CONFIG --cflags "osi-mosek" 2>/dev/null`
    2803828016    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2803928017        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2804428022    fi
    2804528023    MSK_CFLAGS="$cflags"
    28046     MSK_LIBS=`"$PKG_CONFIG" --libs "osi-mosek" 2>/dev/null`
    28047     MSK_DATA=`"$PKG_CONFIG" --variable=datadir "osi-mosek" 2>/dev/null`
     28024    MSK_LIBS=`$PKG_CONFIG --libs "osi-mosek" 2>/dev/null`
     28025    MSK_DATA=`$PKG_CONFIG --variable=datadir "osi-mosek" 2>/dev/null`
    2804828026     coin_has_msk=yes
    2804928027        echo "$as_me:$LINENO: result: yes: $MSK_VERSIONS" >&5
     
    2806728045
    2806828046  else
    28069     MSK_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-mosek"`
     28047    MSK_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-mosek"`
    2807028048      coin_has_msk=notGiven
    2807128049        echo "$as_me:$LINENO: result: not given: $MSK_PKG_ERRORS" >&5
     
    2811328091allpcfiles=""
    2811428092allpcifiles=""
    28115 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    28116 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2811728093while test "x$projtoprocess" != x ; do
    2811828094
     
    2854628522
    2854728523if test -n "$PKG_CONFIG" ; then
    28548   if "$PKG_CONFIG" --exists "osi-soplex"; then
    28549     SPX_VERSIONS=`"$PKG_CONFIG" --modversion "osi-soplex" 2>/dev/null | tr '\n' ' '`
    28550      cflags=`"$PKG_CONFIG" --cflags "osi-soplex" 2>/dev/null`
     28524  if $PKG_CONFIG --exists "osi-soplex"; then
     28525    SPX_VERSIONS=`$PKG_CONFIG --modversion "osi-soplex" 2>/dev/null | tr '\n' ' '`
     28526     cflags=`$PKG_CONFIG --cflags "osi-soplex" 2>/dev/null`
    2855128527    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2855228528        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2855728533    fi
    2855828534    SPX_CFLAGS="$cflags"
    28559     SPX_LIBS=`"$PKG_CONFIG" --libs "osi-soplex" 2>/dev/null`
    28560     SPX_DATA=`"$PKG_CONFIG" --variable=datadir "osi-soplex" 2>/dev/null`
     28535    SPX_LIBS=`$PKG_CONFIG --libs "osi-soplex" 2>/dev/null`
     28536    SPX_DATA=`$PKG_CONFIG --variable=datadir "osi-soplex" 2>/dev/null`
    2856128537     coin_has_spx=yes
    2856228538        echo "$as_me:$LINENO: result: yes: $SPX_VERSIONS" >&5
     
    2858028556
    2858128557  else
    28582     SPX_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-soplex"`
     28558    SPX_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-soplex"`
    2858328559      coin_has_spx=notGiven
    2858428560        echo "$as_me:$LINENO: result: not given: $SPX_PKG_ERRORS" >&5
     
    2862628602allpcfiles=""
    2862728603allpcifiles=""
    28628 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    28629 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2863028604while test "x$projtoprocess" != x ; do
    2863128605
     
    2904829022
    2904929023if test -n "$PKG_CONFIG" ; then
    29050   if "$PKG_CONFIG" --exists "osi-xpress"; then
    29051     XPR_VERSIONS=`"$PKG_CONFIG" --modversion "osi-xpress" 2>/dev/null | tr '\n' ' '`
    29052      cflags=`"$PKG_CONFIG" --cflags "osi-xpress" 2>/dev/null`
     29024  if $PKG_CONFIG --exists "osi-xpress"; then
     29025    XPR_VERSIONS=`$PKG_CONFIG --modversion "osi-xpress" 2>/dev/null | tr '\n' ' '`
     29026     cflags=`$PKG_CONFIG --cflags "osi-xpress" 2>/dev/null`
    2905329027    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2905429028        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2905929033    fi
    2906029034    XPR_CFLAGS="$cflags"
    29061     XPR_LIBS=`"$PKG_CONFIG" --libs "osi-xpress" 2>/dev/null`
    29062     XPR_DATA=`"$PKG_CONFIG" --variable=datadir "osi-xpress" 2>/dev/null`
     29035    XPR_LIBS=`$PKG_CONFIG --libs "osi-xpress" 2>/dev/null`
     29036    XPR_DATA=`$PKG_CONFIG --variable=datadir "osi-xpress" 2>/dev/null`
    2906329037     coin_has_xpr=yes
    2906429038        echo "$as_me:$LINENO: result: yes: $XPR_VERSIONS" >&5
     
    2907829052
    2907929053  else
    29080     XPR_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "osi-xpress"`
     29054    XPR_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-xpress"`
    2908129055      coin_has_xpr=notGiven
    2908229056        echo "$as_me:$LINENO: result: not given: $XPR_PKG_ERRORS" >&5
     
    2912429098allpcfiles=""
    2912529099allpcifiles=""
    29126 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    29127 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2912829100while test "x$projtoprocess" != x ; do
    2912929101
     
    2955929531
    2956029532if test -n "$PKG_CONFIG" ; then
    29561   if "$PKG_CONFIG" --exists "coinasl"; then
    29562     ASL_VERSIONS=`"$PKG_CONFIG" --modversion "coinasl" 2>/dev/null | tr '\n' ' '`
    29563      cflags=`"$PKG_CONFIG" --cflags "coinasl" 2>/dev/null`
     29533  if $PKG_CONFIG --exists "coinasl"; then
     29534    ASL_VERSIONS=`$PKG_CONFIG --modversion "coinasl" 2>/dev/null | tr '\n' ' '`
     29535     cflags=`$PKG_CONFIG --cflags "coinasl" 2>/dev/null`
    2956429536    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2956529537        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2957029542    fi
    2957129543    ASL_CFLAGS="$cflags"
    29572     ASL_LIBS=`"$PKG_CONFIG" --libs "coinasl" 2>/dev/null`
    29573     ASL_DATA=`"$PKG_CONFIG" --variable=datadir "coinasl" 2>/dev/null`
     29544    ASL_LIBS=`$PKG_CONFIG --libs "coinasl" 2>/dev/null`
     29545    ASL_DATA=`$PKG_CONFIG --variable=datadir "coinasl" 2>/dev/null`
    2957429546     coin_has_asl=yes
    2957529547        echo "$as_me:$LINENO: result: yes: $ASL_VERSIONS" >&5
     
    2959729569
    2959829570  else
    29599     ASL_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "coinasl"`
     29571    ASL_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coinasl"`
    2960029572      coin_has_asl=notGiven
    2960129573        echo "$as_me:$LINENO: result: not given: $ASL_PKG_ERRORS" >&5
     
    2964329615allpcfiles=""
    2964429616allpcifiles=""
    29645 echo "$as_me:$LINENO: checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects" >&5
    29646 echo $ECHO_N "checking in directories $COIN_PKG_CONFIG_PATH_UNINSTALLED for projects... $ECHO_C" >&6
    2964729617while test "x$projtoprocess" != x ; do
    2964829618
  • trunk/Cbc/src/Makefile.am

    r1933 r1934  
    265265
    266266install-exec-hook:
    267         test -s cbc.exe.manifest && \
    268         mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
    269         cp cbc.exe $(bindir)/clp.exe
     267        if COIN_CXX_IS_CL
     268                test -s cbc.exe.manifest && \
     269                mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
     270                cp cbc.exe $(bindir)/clp.exe
     271        endif
    270272
    271273#######################################################################
  • trunk/Cbc/src/Makefile.in

    r1933 r1934  
    12781278
    12791279install-exec-hook:
    1280         test -s cbc.exe.manifest && \
    1281         mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
    1282         cp cbc.exe $(bindir)/clp.exe
     1280        if COIN_CXX_IS_CL
     1281                test -s cbc.exe.manifest && \
     1282                mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
     1283                cp cbc.exe $(bindir)/clp.exe
     1284        endif
    12831285
    12841286#######################################################################
Note: See TracChangeset for help on using the changeset viewer.