Changeset 144


Ignore:
Timestamp:
Sep 16, 2008 8:35:51 PM (11 years ago)
Author:
bjarni
Message:

Fixed test/Makefile so libCbcSolver.la comes before libCbc.la

Location:
stable/1.2/CoinMP
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.2/CoinMP/configure

    r142 r144  
    26442644        coin_add_cflags="-pipe"
    26452645        coin_dbg_cflags="-g"
    2646         coin_warn_cflags="-pedantic-errors -Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall"
     2646        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas"
     2647        case $build in
     2648          *-darwin*)
     2649            ;;
     2650          *)
     2651            coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
     2652            ;;
     2653        esac
    26472654        case $enable_doscompile in
    26482655          mingw)
     
    27172724        case "$CC" in
    27182725          icc* | */icc*)
    2719             coin_opt_cflags="-O3 -ip"
     2726            coin_opt_cflags="-O3 -ip -mp1"
    27202727            coin_add_cflags=""
    27212728            coin_dbg_cflags="-g"
     
    30723079             fi ;;
    30733080  *-*-solaris*)
    3074              comps="CC xlC aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
     3081             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    30753082  *-darwin*) comps="g++ c++ CC" ;;
    3076           *) comps="xlC aCC CC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
     3083          *) comps="xlC_r aCC CC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    30773084esac
    30783085
     
    34863493        coin_add_cxxflags="-pipe"
    34873494        coin_dbg_cxxflags="-g"
    3488         coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion"
    3489         case $enable_doscompile in
    3490           mingw)
    3491             CXXFLAGS="-mno-cygwin"
    3492             cat >conftest.$ac_ext <<_ACEOF
     3495        coin_warn_cxxflags="-Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas"
     3496        case $build in
     3497          *-darwin*)
     3498            ;;
     3499          *)
     3500            coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
     3501            ;;
     3502        esac
     3503
     3504        case $enable_doscompile in
     3505          mingw)
     3506            CXXFLAGS="-mno-cygwin"
     3507            cat >conftest.$ac_ext <<_ACEOF
    34933508/* confdefs.h.  */
    34943509_ACEOF
     
    35353550rm -f conftest.err conftest.$ac_objext \
    35363551      conftest$ac_exeext conftest.$ac_ext
    3537             CXXFLAGS=
    3538             ;;
    3539         esac
     3552            CXXFLAGS=
     3553          ;;
     3554        esac
    35403555    esac
    35413556  fi
     
    35643579        case "$CXX" in
    35653580          icpc* | */icpc*)
    3566             coin_opt_cxxflags="-O3 -ip"
     3581            coin_opt_cxxflags="-O3 -ip -mp1"
    35673582            coin_add_cxxflags=""
    35683583            coin_dbg_cxxflags="-g"
     
    36273642          xlC* | */xlC* | mpxlC* | */mpxlC*)
    36283643            coin_opt_cxxflags="-O -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
    3629             coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029"
     3644            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029 -qsourcetype=c++"
    36303645            coin_dbg_cxxflags="-g"
    36313646            ;;
     
    56395654*-*-irix6*)
    56405655  # Find out which ABI we are using.
    5641   echo '#line 5641 "configure"' > conftest.$ac_ext
     5656  echo '#line 5656 "configure"' > conftest.$ac_ext
    56425657  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    56435658  (eval $ac_compile) 2>&5
     
    67736788
    67746789# Provide some information about the compiler.
    6775 echo "$as_me:6775:" \
     6790echo "$as_me:6790:" \
    67766791     "checking for Fortran 77 compiler version" >&5
    67776792ac_compiler=`set X $ac_compile; echo $2`
     
    78407855   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78417856   -e 's:$: $lt_compiler_flag:'`
    7842    (eval echo "\"\$as_me:7842: $lt_compile\"" >&5)
     7857   (eval echo "\"\$as_me:7857: $lt_compile\"" >&5)
    78437858   (eval "$lt_compile" 2>conftest.err)
    78447859   ac_status=$?
    78457860   cat conftest.err >&5
    7846    echo "$as_me:7846: \$? = $ac_status" >&5
     7861   echo "$as_me:7861: \$? = $ac_status" >&5
    78477862   if (exit $ac_status) && test -s "$ac_outfile"; then
    78487863     # The compiler can only warn and ignore the option if not recognized
     
    81088123   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81098124   -e 's:$: $lt_compiler_flag:'`
    8110    (eval echo "\"\$as_me:8110: $lt_compile\"" >&5)
     8125   (eval echo "\"\$as_me:8125: $lt_compile\"" >&5)
    81118126   (eval "$lt_compile" 2>conftest.err)
    81128127   ac_status=$?
    81138128   cat conftest.err >&5
    8114    echo "$as_me:8114: \$? = $ac_status" >&5
     8129   echo "$as_me:8129: \$? = $ac_status" >&5
    81158130   if (exit $ac_status) && test -s "$ac_outfile"; then
    81168131     # The compiler can only warn and ignore the option if not recognized
     
    82128227   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82138228   -e 's:$: $lt_compiler_flag:'`
    8214    (eval echo "\"\$as_me:8214: $lt_compile\"" >&5)
     8229   (eval echo "\"\$as_me:8229: $lt_compile\"" >&5)
    82158230   (eval "$lt_compile" 2>out/conftest.err)
    82168231   ac_status=$?
    82178232   cat out/conftest.err >&5
    8218    echo "$as_me:8218: \$? = $ac_status" >&5
     8233   echo "$as_me:8233: \$? = $ac_status" >&5
    82198234   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    82208235   then
     
    1055710572  lt_status=$lt_dlunknown
    1055810573  cat > conftest.$ac_ext <<EOF
    10559 #line 10559 "configure"
     10574#line 10574 "configure"
    1056010575#include "confdefs.h"
    1056110576
     
    1065710672  lt_status=$lt_dlunknown
    1065810673  cat > conftest.$ac_ext <<EOF
    10659 #line 10659 "configure"
     10674#line 10674 "configure"
    1066010675#include "confdefs.h"
    1066110676
     
    1300113016   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1300213017   -e 's:$: $lt_compiler_flag:'`
    13003    (eval echo "\"\$as_me:13003: $lt_compile\"" >&5)
     13018   (eval echo "\"\$as_me:13018: $lt_compile\"" >&5)
    1300413019   (eval "$lt_compile" 2>conftest.err)
    1300513020   ac_status=$?
    1300613021   cat conftest.err >&5
    13007    echo "$as_me:13007: \$? = $ac_status" >&5
     13022   echo "$as_me:13022: \$? = $ac_status" >&5
    1300813023   if (exit $ac_status) && test -s "$ac_outfile"; then
    1300913024     # The compiler can only warn and ignore the option if not recognized
     
    1310513120   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1310613121   -e 's:$: $lt_compiler_flag:'`
    13107    (eval echo "\"\$as_me:13107: $lt_compile\"" >&5)
     13122   (eval echo "\"\$as_me:13122: $lt_compile\"" >&5)
    1310813123   (eval "$lt_compile" 2>out/conftest.err)
    1310913124   ac_status=$?
    1311013125   cat out/conftest.err >&5
    13111    echo "$as_me:13111: \$? = $ac_status" >&5
     13126   echo "$as_me:13126: \$? = $ac_status" >&5
    1311213127   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1311313128   then
     
    1467514690   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1467614691   -e 's:$: $lt_compiler_flag:'`
    14677    (eval echo "\"\$as_me:14677: $lt_compile\"" >&5)
     14692   (eval echo "\"\$as_me:14692: $lt_compile\"" >&5)
    1467814693   (eval "$lt_compile" 2>conftest.err)
    1467914694   ac_status=$?
    1468014695   cat conftest.err >&5
    14681    echo "$as_me:14681: \$? = $ac_status" >&5
     14696   echo "$as_me:14696: \$? = $ac_status" >&5
    1468214697   if (exit $ac_status) && test -s "$ac_outfile"; then
    1468314698     # The compiler can only warn and ignore the option if not recognized
     
    1477914794   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1478014795   -e 's:$: $lt_compiler_flag:'`
    14781    (eval echo "\"\$as_me:14781: $lt_compile\"" >&5)
     14796   (eval echo "\"\$as_me:14796: $lt_compile\"" >&5)
    1478214797   (eval "$lt_compile" 2>out/conftest.err)
    1478314798   ac_status=$?
    1478414799   cat out/conftest.err >&5
    14785    echo "$as_me:14785: \$? = $ac_status" >&5
     14800   echo "$as_me:14800: \$? = $ac_status" >&5
    1478614801   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1478714802   then
     
    1698617001   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1698717002   -e 's:$: $lt_compiler_flag:'`
    16988    (eval echo "\"\$as_me:16988: $lt_compile\"" >&5)
     17003   (eval echo "\"\$as_me:17003: $lt_compile\"" >&5)
    1698917004   (eval "$lt_compile" 2>conftest.err)
    1699017005   ac_status=$?
    1699117006   cat conftest.err >&5
    16992    echo "$as_me:16992: \$? = $ac_status" >&5
     17007   echo "$as_me:17007: \$? = $ac_status" >&5
    1699317008   if (exit $ac_status) && test -s "$ac_outfile"; then
    1699417009     # The compiler can only warn and ignore the option if not recognized
     
    1725417269   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1725517270   -e 's:$: $lt_compiler_flag:'`
    17256    (eval echo "\"\$as_me:17256: $lt_compile\"" >&5)
     17271   (eval echo "\"\$as_me:17271: $lt_compile\"" >&5)
    1725717272   (eval "$lt_compile" 2>conftest.err)
    1725817273   ac_status=$?
    1725917274   cat conftest.err >&5
    17260    echo "$as_me:17260: \$? = $ac_status" >&5
     17275   echo "$as_me:17275: \$? = $ac_status" >&5
    1726117276   if (exit $ac_status) && test -s "$ac_outfile"; then
    1726217277     # The compiler can only warn and ignore the option if not recognized
     
    1735817373   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1735917374   -e 's:$: $lt_compiler_flag:'`
    17360    (eval echo "\"\$as_me:17360: $lt_compile\"" >&5)
     17375   (eval echo "\"\$as_me:17375: $lt_compile\"" >&5)
    1736117376   (eval "$lt_compile" 2>out/conftest.err)
    1736217377   ac_status=$?
    1736317378   cat out/conftest.err >&5
    17364    echo "$as_me:17364: \$? = $ac_status" >&5
     17379   echo "$as_me:17379: \$? = $ac_status" >&5
    1736517380   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1736617381   then
  • stable/1.2/CoinMP/test/Makefile.am

    r91 r144  
    3939# libraries and include dirs
    4040
     41if COIN_HAS_CBC
     42  AM_CPPFLAGS += -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
     43        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
     44  unitTest_LDADD += $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
     45        $(CBCOBJDIR)/src/libCbcSolver.la $(CBCOBJDIR)/src/libCbc.la
     46  LIBS += `cat $(CBCOBJDIR)/cbc_addlibs.txt`
     47endif
     48
     49if COIN_HAS_CGL
     50  unitTest_LDADD += $(CGLOBJDIR)/src/libCgl.la
     51  LIBS += `cat $(CGLOBJDIR)/cgl_addlibs.txt`
     52endif
     53
    4154if COIN_HAS_CLP
    4255  AM_CPPFLAGS += -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
     
    4659        $(CLPOBJDIR)/src/libClp.la
    4760  LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
    48 endif
    49 
    50 if COIN_HAS_CBC
    51   AM_CPPFLAGS += -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    52         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
    53   unitTest_LDADD += $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
    54         $(CBCOBJDIR)/src/libCbc.la $(CBCOBJDIR)/src/libCbcSolver.la
    55   LIBS += `cat $(CBCOBJDIR)/cbc_addlibs.txt`
    56 endif
    57 
    58 if COIN_HAS_CGL
    59   unitTest_LDADD += $(CGLOBJDIR)/src/libCgl.la
    60   LIBS += `cat $(CGLOBJDIR)/cgl_addlibs.txt`
    6161endif
    6262
  • stable/1.2/CoinMP/test/Makefile.in

    r91 r144  
    5050# Depending of what solvers are available, we add the corresponding files,
    5151# libraries and include dirs
    52 @COIN_HAS_CLP_TRUE@am__append_1 = -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
     52@COIN_HAS_CBC_TRUE@am__append_1 = -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
     53@COIN_HAS_CBC_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
     54
     55@COIN_HAS_CBC_TRUE@am__append_2 = $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
     56@COIN_HAS_CBC_TRUE@     $(CBCOBJDIR)/src/libCbcSolver.la $(CBCOBJDIR)/src/libCbc.la
     57
     58@COIN_HAS_CBC_TRUE@am__append_3 = `cat $(CBCOBJDIR)/cbc_addlibs.txt`
     59@COIN_HAS_CGL_TRUE@am__append_4 = $(CGLOBJDIR)/src/libCgl.la
     60@COIN_HAS_CGL_TRUE@am__append_5 = `cat $(CGLOBJDIR)/cgl_addlibs.txt`
     61@COIN_HAS_CLP_TRUE@am__append_6 = -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    5362@COIN_HAS_CLP_TRUE@     -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    5463@COIN_HAS_CLP_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp`
    5564
    56 @COIN_HAS_CLP_TRUE@am__append_2 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     65@COIN_HAS_CLP_TRUE@am__append_7 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    5766@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la
    5867
    59 @COIN_HAS_CLP_TRUE@am__append_3 = `cat $(CLPOBJDIR)/clp_addlibs.txt`
    60 @COIN_HAS_CBC_TRUE@am__append_4 = -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    61 @COIN_HAS_CBC_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
    62 
    63 @COIN_HAS_CBC_TRUE@am__append_5 = $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
    64 @COIN_HAS_CBC_TRUE@     $(CBCOBJDIR)/src/libCbc.la $(CBCOBJDIR)/src/libCbcSolver.la
    65 
    66 @COIN_HAS_CBC_TRUE@am__append_6 = `cat $(CBCOBJDIR)/cbc_addlibs.txt`
    67 @COIN_HAS_CGL_TRUE@am__append_7 = $(CGLOBJDIR)/src/libCgl.la
    68 @COIN_HAS_CGL_TRUE@am__append_8 = `cat $(CGLOBJDIR)/cgl_addlibs.txt`
     68@COIN_HAS_CLP_TRUE@am__append_8 = `cat $(CLPOBJDIR)/clp_addlibs.txt`
    6969subdir = test
    7070DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    8080am_unitTest_OBJECTS = unitTest.$(OBJEXT)
    8181unitTest_OBJECTS = $(am_unitTest_OBJECTS)
    82 @COIN_HAS_CLP_TRUE@am__DEPENDENCIES_1 =  \
     82@COIN_HAS_CBC_TRUE@am__DEPENDENCIES_1 =  \
     83@COIN_HAS_CBC_TRUE@     $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
     84@COIN_HAS_CBC_TRUE@     $(CBCOBJDIR)/src/libCbcSolver.la \
     85@COIN_HAS_CBC_TRUE@     $(CBCOBJDIR)/src/libCbc.la
     86@COIN_HAS_CGL_TRUE@am__DEPENDENCIES_2 = $(CGLOBJDIR)/src/libCgl.la
     87@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_3 =  \
    8388@COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    8489@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la
    85 @COIN_HAS_CBC_TRUE@am__DEPENDENCIES_2 =  \
    86 @COIN_HAS_CBC_TRUE@     $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
    87 @COIN_HAS_CBC_TRUE@     $(CBCOBJDIR)/src/libCbc.la \
    88 @COIN_HAS_CBC_TRUE@     $(CBCOBJDIR)/src/libCbcSolver.la
    89 @COIN_HAS_CGL_TRUE@am__DEPENDENCIES_3 = $(CGLOBJDIR)/src/libCgl.la
    9090unitTest_DEPENDENCIES = ../src/libCoinMP.la $(am__DEPENDENCIES_1) \
    9191        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
     
    186186
    187187# List additional libraries
    188 LIBS = @LIBS@ $(am__append_3) $(am__append_6) $(am__append_8) `cat \
     188LIBS = @LIBS@ $(am__append_3) $(am__append_5) $(am__append_8) `cat \
    189189        $(OSIOBJDIR)/osi_addlibs.txt` `cat \
    190190        $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
     
    338338
    339339# Finally the Coin library (many of the above need it)
    340 unitTest_LDADD = ../src/libCoinMP.la $(am__append_2) $(am__append_5) \
     340unitTest_LDADD = ../src/libCoinMP.la $(am__append_2) $(am__append_4) \
    341341        $(am__append_7) $(OSIOBJDIR)/src/libOsi.la \
    342342        $(COINUTILSOBJDIR)/src/libCoinUtils.la
     
    347347        $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    348348        -I`$(CYGPATH_W) $(OSIOBJDIR)/inc` -I`$(CYGPATH_W) \
    349         $(srcdir)/../src` $(am__append_1) $(am__append_4)
     349        $(srcdir)/../src` $(am__append_1) $(am__append_6)
    350350
    351351# This line is necessary to allow VPATH compilation with MS compilers
Note: See TracChangeset for help on using the changeset viewer.