Changeset 324


Ignore:
Timestamp:
May 17, 2006 12:55:49 AM (13 years ago)
Author:
andreasw
Message:

several fixes for Cygwin; automatically gunzip examples files if zlib is not available

Location:
trunk/Cbc
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure

    r323 r324  
    16381638# externals.  The following macro ensures that those externals are
    16391639# retrieved by svn if they are not there yet.
    1640 # Initialize the ADDLIBS variable (a number of library require -lm)
    1641 ADDLIBS="" #"-lm"
     1640# Initialize the ADDLIBS variable
     1641ADDLIBS=
    16421642
    16431643
     
    23732373        case "$CXX" in
    23742374          cl | */cl)
    2375             coin_opt_cxxflags='-Ot1'
    2376             coin_add_cxxflags='-nologo -EHsc -GR -MT'
     2375            coin_opt_cxxflags='-O2'
     2376            coin_add_cxxflags='-nologo -GX -GR -MT'
    23772377            coin_dbg_cxxflags='-Yd'
    23782378            ;;
     
    1952319523          -e 's%lib /OUT:%lib -OUT:%' \
    1952419524          -e "s%cygpath -w%$CYGPATH_W%" \
    19525           -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo\\`; echo dd \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
     19525          -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
    1952619526          -e 's/$AR t/lib -nologo -list/' \
     19527          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    1952719528      libtool > conftest.bla
    1952819529
  • trunk/Cbc/src/Makefile.am

    r320 r324  
    214214DEFS += -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
    215215
     216# This line is necessary to allow VPATH compilation with MS compilers
     217# on Cygwin
     218DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     219
    216220########################################################################
    217221#                Headers that need to be installed                     #
  • trunk/Cbc/src/Makefile.in

    r320 r324  
    182182        $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    183183        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    184 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    185184depcomp = $(SHELL) $(top_srcdir)/../depcomp
    186185am__depfiles_maybe = depfiles
     
    505504solve_LDFLAGS = -rpath $(libdir)
    506505
     506# This line is necessary to allow VPATH compilation with MS compilers
     507# on Cygwin
     508DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     509
    507510########################################################################
    508511#                Headers that need to be installed                     #
  • trunk/Cbc/test/Makefile.am

    r317 r324  
    1010
    1111########################################################################
    12 #                         unitTest for Clp                             #
     12#                         unitTest for Cbc                             #
    1313########################################################################
    1414
    15 # We are using the CLP solver executable to do the unit test
     15# We are using the Cbc solver executable to do the unit test
    1616
    17 test: ../src/cbc$(EXEEXT) ../src/solve$(EXEEXT)
     17test: ../src/cbc$(EXEEXT) ../src/solve$(EXEEXT) $(extra_target)
     18        cd ../../Data/Netlib; make uncompress
     19        cd ../../Data/miplib3; make uncompress
    1820        ../src/cbc$(EXEEXT) -miplib -unitTest
    1921        ../src/solve$(EXEEXT) -unitTest -netlib
    2022
    21 .PHONY: test
     23.PHONY: test example_files
    2224
    2325########################################################################
  • trunk/Cbc/test/Makefile.in

    r319 r324  
    404404
    405405########################################################################
    406 #                         unitTest for Clp                             #
     406#                         unitTest for Cbc                             #
    407407########################################################################
    408408
    409 # We are using the CLP solver executable to do the unit test
    410 
    411 test: ../src/cbc$(EXEEXT) ../src/solve$(EXEEXT)
     409# We are using the Cbc solver executable to do the unit test
     410
     411test: ../src/cbc$(EXEEXT) ../src/solve$(EXEEXT) $(extra_target)
     412        cd ../../Data/Netlib; make uncompress
     413        cd ../../Data/miplib3; make uncompress
    412414        ../src/cbc$(EXEEXT) -miplib -unitTest
    413415        ../src/solve$(EXEEXT) -unitTest -netlib
    414416
    415 .PHONY: test
     417.PHONY: test example_files
    416418# Tell versions [3.59,3.63) of GNU make to not export all variables.
    417419# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.