Ignore:
Timestamp:
Oct 17, 2018 3:46:31 PM (12 months ago)
Author:
stefan
Message:

eliminate CYGPATH_W from -I flags; rerun autotools

Location:
branches/autotools-update/Cbc
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Cbc/get.dependencies.sh

    r2395 r2399  
    7777    elif [ $1 = 2 ]; then
    7878        $MAKE -j $jobs $2 > /dev/null
     79    elif [ $1 = 3 ]; then
     80        $MAKE -j $jobs $2
    7981    else
    80         $MAKE -j $jobs $2
     82        $MAKE -j $jobs V=1 $2
    8183    fi
    8284}
  • branches/autotools-update/Cbc/src/OsiCbc/Makefile.am

    r2395 r2399  
    3030libOsiCbc_la_LDFLAGS = $(LT_LDFLAGS)
    3131
    32 # Here list all include flags, relative to this "srcdir" directory.  This
    33 # "cygpath" stuff is necessary to compile with native compilers on Windows.
    34 
    35 AM_CPPFLAGS = -DCBC_BUILD -I`$(CYGPATH_W) $(srcdir)/..` $(OSICBCLIB_CFLAGS)
     32# Here list all include flags, relative to this "srcdir" directory.
     33AM_CPPFLAGS = -DCBC_BUILD -I$(srcdir)/.. $(OSICBCLIB_CFLAGS)
    3634
    3735# Plus the appropriate include directories for the default solver.
  • branches/autotools-update/Cbc/src/OsiCbc/Makefile.in

    r2395 r2399  
    451451libOsiCbc_la_LDFLAGS = $(LT_LDFLAGS)
    452452
    453 # Here list all include flags, relative to this "srcdir" directory.  This
    454 # "cygpath" stuff is necessary to compile with native compilers on Windows.
    455 AM_CPPFLAGS = -DCBC_BUILD -I`$(CYGPATH_W) $(srcdir)/..` \
    456         $(OSICBCLIB_CFLAGS) $(am__append_1) $(am__append_2) \
    457         $(am__append_3) $(am__append_4) $(am__append_5) \
    458         $(am__append_6) $(am__append_7) $(am__append_8)
     453# Here list all include flags, relative to this "srcdir" directory.
     454AM_CPPFLAGS = -DCBC_BUILD -I$(srcdir)/.. $(OSICBCLIB_CFLAGS) \
     455        $(am__append_1) $(am__append_2) $(am__append_3) \
     456        $(am__append_4) $(am__append_5) $(am__append_6) \
     457        $(am__append_7) $(am__append_8)
    459458
    460459########################################################################
  • branches/autotools-update/Cbc/test/Makefile.am

    r2390 r2399  
    6565gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LFLAGS)
    6666
    67 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(CBCLIB_CFLAGS)
     67AM_CPPFLAGS = -I$(srcdir)/../src $(CBCLIB_CFLAGS)
    6868# AM_CPPFLAGS += $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
    6969
     
    7777    $(CBCUNITTEST_LFLAGS)
    7878
    79 AM_CPPFLAGS += -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc` $(CBCUNITTEST_CFLAGS)
     79AM_CPPFLAGS += -I$(srcdir)/../src/OsiCbc $(CBCUNITTEST_CFLAGS)
    8080
    8181ositests: osiUnitTest$(EXEEXT)
  • branches/autotools-update/Cbc/test/Makefile.in

    r2390 r2399  
    421421gamsTest_SOURCES = gamsTest.cpp
    422422gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LFLAGS)
    423 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(CBCLIB_CFLAGS) \
    424         -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc` $(CBCUNITTEST_CFLAGS)
     423AM_CPPFLAGS = -I$(srcdir)/../src $(CBCLIB_CFLAGS) \
     424        -I$(srcdir)/../src/OsiCbc $(CBCUNITTEST_CFLAGS)
    425425# AM_CPPFLAGS += $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
    426426
Note: See TracChangeset for help on using the changeset viewer.