Changeset 2244 for ThirdParty/SCIP
- Timestamp:
- Jun 9, 2011 1:39:30 PM (10 years ago)
- Location:
- ThirdParty/SCIP/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
ThirdParty/SCIP/trunk/configure
r2241 r2244 21301 21301 SOPLEX_CFLAGS= 21302 21302 SOPLEX_DATA= 21303 SOPLEX_DEPENDENCIES= 21304 SOPLEX_PCLIBS= 21305 SOPLEX_PCREQUIRES= 21306 SOPLEX_DATA= 21303 21307 21304 21308 … … 21321 21325 coin_has_soplex=yes 21322 21326 SOPLEX_LIBS="$withval" 21327 SOPLEX_PCLIBS="$withval" 21323 21328 21324 21329 # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables … … 21408 21413 SOPLEX_LIBS=`echo " $SOPLEX_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'` 21409 21414 fi 21415 SOPLEX_PCREQUIRES="coinsoplex" 21410 21416 21411 21417 # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in … … 21447 21453 SOPLEX_DATA= 21448 21454 SOPLEX_DATA_INSTALLED= 21455 SOPLEX_PCLIBS= 21456 SOPLEX_PCREQUIRES= 21449 21457 21450 21458 # initial list of dependencies is "coinsoplex", but we need to filter out version number specifications (= x, <= x, >= x, != x) … … 21644 21652 fi 21645 21653 21654 SOPLEX_PCREQUIRES="coinsoplex" 21646 21655 21647 21656 … … 21711 21720 echo "$as_me: SoPlex DATA is $SOPLEX_DATA" >&6;} 21712 21721 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 21724 echo "$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 21728 echo "$as_me: SoPlex PCREQUIRES are $SOPLEX_PCREQUIRES" >&6;} 21716 21729 fi 21717 21730 … … 21762 21775 CLP_LIBS= 21763 21776 CLP_CFLAGS= 21777 CLP_DATA= 21778 CLP_DEPENDENCIES= 21779 CLP_PCLIBS= 21780 CLP_PCREQUIRES= 21764 21781 CLP_DATA= 21765 21782 … … 21783 21800 coin_has_clp=yes 21784 21801 CLP_LIBS="$withval" 21802 CLP_PCLIBS="$withval" 21785 21803 21786 21804 # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables … … 21870 21888 CLP_LIBS=`echo " $CLP_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'` 21871 21889 fi 21890 CLP_PCREQUIRES="clp" 21872 21891 21873 21892 # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in … … 21909 21928 CLP_DATA= 21910 21929 CLP_DATA_INSTALLED= 21930 CLP_PCLIBS= 21931 CLP_PCREQUIRES= 21911 21932 21912 21933 # initial list of dependencies is "clp", but we need to filter out version number specifications (= x, <= x, >= x, != x) … … 22106 22127 fi 22107 22128 22129 CLP_PCREQUIRES="clp" 22108 22130 22109 22131 … … 22173 22195 echo "$as_me: Clp DATA is $CLP_DATA" >&6;} 22174 22196 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 22199 echo "$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 22203 echo "$as_me: Clp PCREQUIRES are $CLP_PCREQUIRES" >&6;} 22178 22204 fi 22179 22205 … … 23152 23178 SCIPLIB_LIBS_INSTALLED="$SCIPLIB_LIBS $SOPLEX_LIBS_INSTALLED" 23153 23179 SCIPLIB_PCLIBS="$SCIPLIB_PCLIBS $SOPLEX_PCLIBS" 23154 SCIPLIB_PCREQUIRES=" coinsoplex$SOPLEX_PCREQUIRES"23180 SCIPLIB_PCREQUIRES="$SCIPLIB_PCREQUIRES $SOPLEX_PCREQUIRES" 23155 23181 ;; 23156 23182 clp) … … 23343 23369 IPOPT_CFLAGS= 23344 23370 IPOPT_DATA= 23371 IPOPT_DEPENDENCIES= 23372 IPOPT_PCLIBS= 23373 IPOPT_PCREQUIRES= 23374 IPOPT_DATA= 23345 23375 23346 23376 … … 23371 23401 coin_has_ipopt=yes 23372 23402 IPOPT_LIBS="$withval" 23403 IPOPT_PCLIBS="$withval" 23373 23404 23374 23405 SCIPLIB_PCLIBS="$withval $SCIPLIB_PCLIBS" … … 23461 23492 IPOPT_LIBS=`echo " $IPOPT_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'` 23462 23493 fi 23494 IPOPT_PCREQUIRES="ipopt != 3.9trunk" 23463 23495 23464 23496 # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in SCIPLib … … 23504 23536 IPOPT_DATA= 23505 23537 IPOPT_DATA_INSTALLED= 23538 IPOPT_PCLIBS= 23539 IPOPT_PCREQUIRES= 23506 23540 23507 23541 # initial list of dependencies is "ipopt != 3.9trunk", but we need to filter out version number specifications (= x, <= x, >= x, != x) … … 23701 23735 fi 23702 23736 23737 IPOPT_PCREQUIRES="ipopt != 3.9trunk" 23703 23738 23704 23739 SCIPLIB_PCREQUIRES="ipopt != 3.9trunk $SCIPLIB_PCREQUIRES" … … 23776 23811 echo "$as_me: Ipopt DATA is $IPOPT_DATA" >&6;} 23777 23812 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 23815 echo "$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 23819 echo "$as_me: Ipopt PCREQUIRES are $IPOPT_PCREQUIRES" >&6;} 23781 23820 fi 23782 23821 … … 23836 23875 CPPAD_LIBS= 23837 23876 CPPAD_CFLAGS= 23877 CPPAD_DATA= 23878 CPPAD_DEPENDENCIES= 23879 CPPAD_PCLIBS= 23880 CPPAD_PCREQUIRES= 23838 23881 CPPAD_DATA= 23839 23882 … … 23865 23908 coin_has_cppad=yes 23866 23909 CPPAD_LIBS="$withval" 23910 CPPAD_PCLIBS="$withval" 23867 23911 23868 23912 SCIPLIB_PCLIBS="$withval $SCIPLIB_PCLIBS" … … 23955 23999 CPPAD_LIBS=`echo " $CPPAD_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'` 23956 24000 fi 24001 CPPAD_PCREQUIRES="cppad" 23957 24002 23958 24003 # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in SCIPLib … … 23998 24043 CPPAD_DATA= 23999 24044 CPPAD_DATA_INSTALLED= 24045 CPPAD_PCLIBS= 24046 CPPAD_PCREQUIRES= 24000 24047 24001 24048 # initial list of dependencies is "cppad", but we need to filter out version number specifications (= x, <= x, >= x, != x) … … 24195 24242 fi 24196 24243 24244 CPPAD_PCREQUIRES="cppad" 24197 24245 24198 24246 SCIPLIB_PCREQUIRES="cppad $SCIPLIB_PCREQUIRES" … … 24270 24318 echo "$as_me: CppAD DATA is $CPPAD_DATA" >&6;} 24271 24319 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 24322 echo "$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 24326 echo "$as_me: CppAD PCREQUIRES are $CPPAD_PCREQUIRES" >&6;} 24275 24327 fi 24276 24328 -
ThirdParty/SCIP/trunk/configure.ac
r2241 r2244 113 113 SCIPLIB_LIBS_INSTALLED="$SCIPLIB_LIBS $SOPLEX_LIBS_INSTALLED" 114 114 SCIPLIB_PCLIBS="$SCIPLIB_PCLIBS $SOPLEX_PCLIBS" 115 SCIPLIB_PCREQUIRES=" coinsoplex$SOPLEX_PCREQUIRES"115 SCIPLIB_PCREQUIRES="$SCIPLIB_PCREQUIRES $SOPLEX_PCREQUIRES" 116 116 ;; 117 117 clp)
Note: See TracChangeset
for help on using the changeset viewer.