Changeset 2244


Ignore:
Timestamp:
Jun 9, 2011 1:39:30 PM (8 years ago)
Author:
stefan
Message:

proper fix for bug in setting up .pc file

Location:
ThirdParty/SCIP/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/SCIP/trunk/configure

    r2241 r2244  
    2130121301SOPLEX_CFLAGS=
    2130221302SOPLEX_DATA=
     21303SOPLEX_DEPENDENCIES=
     21304SOPLEX_PCLIBS=
     21305SOPLEX_PCREQUIRES=
     21306SOPLEX_DATA=
    2130321307
    2130421308
     
    2132121325       coin_has_soplex=yes
    2132221326       SOPLEX_LIBS="$withval"
     21327       SOPLEX_PCLIBS="$withval"
    2132321328
    2132421329       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     
    2140821413          SOPLEX_LIBS=`echo " $SOPLEX_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
    2140921414        fi
     21415        SOPLEX_PCREQUIRES="coinsoplex"
    2141021416
    2141121417        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in
     
    2144721453SOPLEX_DATA=
    2144821454SOPLEX_DATA_INSTALLED=
     21455SOPLEX_PCLIBS=
     21456SOPLEX_PCREQUIRES=
    2144921457
    2145021458# initial list of dependencies is "coinsoplex", but we need to filter out version number specifications (= x, <= x, >= x, != x)
     
    2164421652  fi
    2164521653
     21654  SOPLEX_PCREQUIRES="coinsoplex"
    2164621655
    2164721656
     
    2171121720echo "$as_me: SoPlex DATA   is  $SOPLEX_DATA" >&6;}
    2171221721    fi
    21713     if test -n "$SOPLEX_CFLAGS" ; then
    21714       { echo "$as_me:$LINENO: SoPlex CFLAGS are $SOPLEX_CFLAGS" >&5
    21715 echo "$as_me: SoPlex CFLAGS are $SOPLEX_CFLAGS" >&6;}
     21722    if test -n "$SOPLEX_PCLIBS" ; then
     21723      { echo "$as_me:$LINENO: SoPlex PCLIBS are $SOPLEX_PCLIBS" >&5
     21724echo "$as_me: SoPlex PCLIBS are $SOPLEX_PCLIBS" >&6;}
     21725    fi
     21726    if test -n "$SOPLEX_PCREQUIRES" ; then
     21727      { echo "$as_me:$LINENO: SoPlex PCREQUIRES are $SOPLEX_PCREQUIRES" >&5
     21728echo "$as_me: SoPlex PCREQUIRES are $SOPLEX_PCREQUIRES" >&6;}
    2171621729    fi
    2171721730
     
    2176221775CLP_LIBS=
    2176321776CLP_CFLAGS=
     21777CLP_DATA=
     21778CLP_DEPENDENCIES=
     21779CLP_PCLIBS=
     21780CLP_PCREQUIRES=
    2176421781CLP_DATA=
    2176521782
     
    2178321800       coin_has_clp=yes
    2178421801       CLP_LIBS="$withval"
     21802       CLP_PCLIBS="$withval"
    2178521803
    2178621804       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     
    2187021888          CLP_LIBS=`echo " $CLP_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
    2187121889        fi
     21890        CLP_PCREQUIRES="clp"
    2187221891
    2187321892        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in
     
    2190921928CLP_DATA=
    2191021929CLP_DATA_INSTALLED=
     21930CLP_PCLIBS=
     21931CLP_PCREQUIRES=
    2191121932
    2191221933# initial list of dependencies is "clp", but we need to filter out version number specifications (= x, <= x, >= x, != x)
     
    2210622127  fi
    2210722128
     22129  CLP_PCREQUIRES="clp"
    2210822130
    2210922131
     
    2217322195echo "$as_me: Clp DATA   is  $CLP_DATA" >&6;}
    2217422196    fi
    22175     if test -n "$CLP_CFLAGS" ; then
    22176       { echo "$as_me:$LINENO: Clp CFLAGS are $CLP_CFLAGS" >&5
    22177 echo "$as_me: Clp CFLAGS are $CLP_CFLAGS" >&6;}
     22197    if test -n "$CLP_PCLIBS" ; then
     22198      { echo "$as_me:$LINENO: Clp PCLIBS are $CLP_PCLIBS" >&5
     22199echo "$as_me: Clp PCLIBS are $CLP_PCLIBS" >&6;}
     22200    fi
     22201    if test -n "$CLP_PCREQUIRES" ; then
     22202      { echo "$as_me:$LINENO: Clp PCREQUIRES are $CLP_PCREQUIRES" >&5
     22203echo "$as_me: Clp PCREQUIRES are $CLP_PCREQUIRES" >&6;}
    2217822204    fi
    2217922205
     
    2315223178    SCIPLIB_LIBS_INSTALLED="$SCIPLIB_LIBS $SOPLEX_LIBS_INSTALLED"
    2315323179    SCIPLIB_PCLIBS="$SCIPLIB_PCLIBS $SOPLEX_PCLIBS"
    23154     SCIPLIB_PCREQUIRES="coinsoplex $SOPLEX_PCREQUIRES"
     23180    SCIPLIB_PCREQUIRES="$SCIPLIB_PCREQUIRES $SOPLEX_PCREQUIRES"
    2315523181  ;;
    2315623182  clp)
     
    2334323369IPOPT_CFLAGS=
    2334423370IPOPT_DATA=
     23371IPOPT_DEPENDENCIES=
     23372IPOPT_PCLIBS=
     23373IPOPT_PCREQUIRES=
     23374IPOPT_DATA=
    2334523375
    2334623376
     
    2337123401       coin_has_ipopt=yes
    2337223402       IPOPT_LIBS="$withval"
     23403       IPOPT_PCLIBS="$withval"
    2337323404
    2337423405         SCIPLIB_PCLIBS="$withval $SCIPLIB_PCLIBS"
     
    2346123492          IPOPT_LIBS=`echo " $IPOPT_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
    2346223493        fi
     23494        IPOPT_PCREQUIRES="ipopt != 3.9trunk"
    2346323495
    2346423496        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in SCIPLib
     
    2350423536IPOPT_DATA=
    2350523537IPOPT_DATA_INSTALLED=
     23538IPOPT_PCLIBS=
     23539IPOPT_PCREQUIRES=
    2350623540
    2350723541# initial list of dependencies is "ipopt != 3.9trunk", but we need to filter out version number specifications (= x, <= x, >= x, != x)
     
    2370123735  fi
    2370223736
     23737  IPOPT_PCREQUIRES="ipopt != 3.9trunk"
    2370323738
    2370423739    SCIPLIB_PCREQUIRES="ipopt != 3.9trunk $SCIPLIB_PCREQUIRES"
     
    2377623811echo "$as_me: Ipopt DATA   is  $IPOPT_DATA" >&6;}
    2377723812    fi
    23778     if test -n "$IPOPT_CFLAGS" ; then
    23779       { echo "$as_me:$LINENO: Ipopt CFLAGS are $IPOPT_CFLAGS" >&5
    23780 echo "$as_me: Ipopt CFLAGS are $IPOPT_CFLAGS" >&6;}
     23813    if test -n "$IPOPT_PCLIBS" ; then
     23814      { echo "$as_me:$LINENO: Ipopt PCLIBS are $IPOPT_PCLIBS" >&5
     23815echo "$as_me: Ipopt PCLIBS are $IPOPT_PCLIBS" >&6;}
     23816    fi
     23817    if test -n "$IPOPT_PCREQUIRES" ; then
     23818      { echo "$as_me:$LINENO: Ipopt PCREQUIRES are $IPOPT_PCREQUIRES" >&5
     23819echo "$as_me: Ipopt PCREQUIRES are $IPOPT_PCREQUIRES" >&6;}
    2378123820    fi
    2378223821
     
    2383623875CPPAD_LIBS=
    2383723876CPPAD_CFLAGS=
     23877CPPAD_DATA=
     23878CPPAD_DEPENDENCIES=
     23879CPPAD_PCLIBS=
     23880CPPAD_PCREQUIRES=
    2383823881CPPAD_DATA=
    2383923882
     
    2386523908       coin_has_cppad=yes
    2386623909       CPPAD_LIBS="$withval"
     23910       CPPAD_PCLIBS="$withval"
    2386723911
    2386823912         SCIPLIB_PCLIBS="$withval $SCIPLIB_PCLIBS"
     
    2395523999          CPPAD_LIBS=`echo " $CPPAD_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
    2395624000        fi
     24001        CPPAD_PCREQUIRES="cppad"
    2395724002
    2395824003        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in SCIPLib
     
    2399824043CPPAD_DATA=
    2399924044CPPAD_DATA_INSTALLED=
     24045CPPAD_PCLIBS=
     24046CPPAD_PCREQUIRES=
    2400024047
    2400124048# initial list of dependencies is "cppad", but we need to filter out version number specifications (= x, <= x, >= x, != x)
     
    2419524242  fi
    2419624243
     24244  CPPAD_PCREQUIRES="cppad"
    2419724245
    2419824246    SCIPLIB_PCREQUIRES="cppad $SCIPLIB_PCREQUIRES"
     
    2427024318echo "$as_me: CppAD DATA   is  $CPPAD_DATA" >&6;}
    2427124319    fi
    24272     if test -n "$CPPAD_CFLAGS" ; then
    24273       { echo "$as_me:$LINENO: CppAD CFLAGS are $CPPAD_CFLAGS" >&5
    24274 echo "$as_me: CppAD CFLAGS are $CPPAD_CFLAGS" >&6;}
     24320    if test -n "$CPPAD_PCLIBS" ; then
     24321      { echo "$as_me:$LINENO: CppAD PCLIBS are $CPPAD_PCLIBS" >&5
     24322echo "$as_me: CppAD PCLIBS are $CPPAD_PCLIBS" >&6;}
     24323    fi
     24324    if test -n "$CPPAD_PCREQUIRES" ; then
     24325      { echo "$as_me:$LINENO: CppAD PCREQUIRES are $CPPAD_PCREQUIRES" >&5
     24326echo "$as_me: CppAD PCREQUIRES are $CPPAD_PCREQUIRES" >&6;}
    2427524327    fi
    2427624328
  • ThirdParty/SCIP/trunk/configure.ac

    r2241 r2244  
    113113    SCIPLIB_LIBS_INSTALLED="$SCIPLIB_LIBS $SOPLEX_LIBS_INSTALLED"
    114114    SCIPLIB_PCLIBS="$SCIPLIB_PCLIBS $SOPLEX_PCLIBS"
    115     SCIPLIB_PCREQUIRES="coinsoplex $SOPLEX_PCREQUIRES"
     115    SCIPLIB_PCREQUIRES="$SCIPLIB_PCREQUIRES $SOPLEX_PCREQUIRES"
    116116  ;;
    117117  clp)
Note: See TracChangeset for help on using the changeset viewer.