Changeset 2355


Ignore:
Timestamp:
Oct 17, 2018 3:41:10 PM (3 months ago)
Author:
stefan
Message:

remove CYGPATH_W in Makefile -I flags; rerun autotools

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

Legend:

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

    r2348 r2355  
    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/Clp/src/OsiClp/Makefile.am

    r2348 r2355  
    2727libOsiClp_la_LDFLAGS = $(LT_LDFLAGS)
    2828
    29 # Here list all include flags, relative to this "srcdir" directory.  This
    30 # "cygpath" stuff is necessary to compile with native compilers on Windows.
    31 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(OSICLPLIB_CFLAGS)
     29# Here list all include flags, relative to this "srcdir" directory.
     30AM_CPPFLAGS = -I$(srcdir)/.. $(OSICLPLIB_CFLAGS)
    3231
    3332# This line is necessary to allow VPATH compilation
  • branches/autotools-update/Clp/src/OsiClp/Makefile.in

    r2348 r2355  
    442442libOsiClp_la_LDFLAGS = $(LT_LDFLAGS)
    443443
    444 # Here list all include flags, relative to this "srcdir" directory.  This
    445 # "cygpath" stuff is necessary to compile with native compilers on Windows.
    446 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(OSICLPLIB_CFLAGS)
     444# Here list all include flags, relative to this "srcdir" directory.
     445AM_CPPFLAGS = -I$(srcdir)/.. $(OSICLPLIB_CFLAGS)
    447446
    448447# This line is necessary to allow VPATH compilation
  • branches/autotools-update/Clp/test/Makefile.am

    r2335 r2355  
    2424        $(CLPLIB_LFLAGS) $(OSICLPLIB_LFLAGS) $(OSICLPUNITTEST_LFLAGS)
    2525
    26 AM_CPPFLAGS = \
    27         -I`$(CYGPATH_W) $(srcdir)/../src` \
    28         -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` \
    29          $(OSICLPLIB_CFLAGS) $(OSICLPUNITTEST_CFLAGS)
     26AM_CPPFLAGS = -I$(srcdir)/../src -I$(srcdir)/../src/OsiClp $(OSICLPLIB_CFLAGS) $(OSICLPUNITTEST_CFLAGS)
    3027
    3128testdepend = osiUnitTest$(EXEEXT)
  • branches/autotools-update/Clp/test/Makefile.in

    r2337 r2355  
    390390@COIN_HAS_OSITESTS_TRUE@        $(CLPLIB_LFLAGS) $(OSICLPLIB_LFLAGS) $(OSICLPUNITTEST_LFLAGS)
    391391
    392 @COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = \
    393 @COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src` \
    394 @COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` \
    395 @COIN_HAS_OSITESTS_TRUE@         $(OSICLPLIB_CFLAGS) $(OSICLPUNITTEST_CFLAGS)
    396 
     392@COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = -I$(srcdir)/../src -I$(srcdir)/../src/OsiClp $(OSICLPLIB_CFLAGS) $(OSICLPUNITTEST_CFLAGS)
    397393@COIN_HAS_OSITESTS_TRUE@testdepend = osiUnitTest$(EXEEXT)
    398394
Note: See TracChangeset for help on using the changeset viewer.