Changeset 1782 for stable/1.14


Ignore:
Timestamp:
Aug 14, 2011 6:45:31 AM (8 years ago)
Author:
stefan
Message:

merge chgset 1781 from trunk

Location:
stable/1.14
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • stable/1.14

    • Property svn:mergeinfo changed
      /trunkmerged: 1781
  • stable/1.14/Clp/Makefile.am

    r1753 r1782  
    124124else
    125125if COIN_CXX_IS_CL
    126         echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt
     126        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt
    127127else
    128128        echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
  • stable/1.14/Clp/Makefile.in

    r1753 r1782  
    904904@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    905905@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
    906 @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt
     906@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt
    907907@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
    908908
  • stable/1.14/Clp/src

  • stable/1.14/Clp/src/OsiClp/Makefile.am

    r1753 r1782  
    2424# Here list all include flags, relative to this "srcdir" directory.  This
    2525# "cygpath" stuff is necessary to compile with native compilers on Windows.
    26 # "top_srcdir" refers to the basic directory for the main package that is
    27 # being compiled.
    28 AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) \
    29         -I`$(CYGPATH_W) $(srcdir)/..`
     26AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINUTILS_CFLAGS) $(OSI_CFLAGS)
    3027
    3128# This line is necessary to allow VPATH compilation
     
    3734
    3835# Here list all the header files that are required by a user of the library,
    39 # and that therefore should be installed in 'includedir/coin'
     36# and that therefore should be installed in 'include/coin'
    4037includecoindir = $(includedir)/coin
    4138includecoin_HEADERS = OsiClpSolverInterface.hpp
  • stable/1.14/Clp/src/OsiClp/Makefile.in

    r1753 r1782  
    360360# Here list all include flags, relative to this "srcdir" directory.  This
    361361# "cygpath" stuff is necessary to compile with native compilers on Windows.
    362 # "top_srcdir" refers to the basic directory for the main package that is
    363 # being compiled.
    364 AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) \
    365         -I`$(CYGPATH_W) $(srcdir)/..`
    366 
     362AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINUTILS_CFLAGS) $(OSI_CFLAGS)
    367363
    368364# This line is necessary to allow VPATH compilation
     
    374370
    375371# Here list all the header files that are required by a user of the library,
    376 # and that therefore should be installed in 'includedir/coin'
     372# and that therefore should be installed in 'include/coin'
    377373includecoindir = $(includedir)/coin
    378374includecoin_HEADERS = OsiClpSolverInterface.hpp
  • stable/1.14/Clp/test/Makefile.am

    r1655 r1782  
    2525  $(CLPLIB_DEPENDENCIES) $(OSICLP_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
    2626
    27 AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \
     27AM_CPPFLAGS = \
    2828        -I`$(CYGPATH_W) $(srcdir)/../src` \
    29         -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`
     29        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` \
     30        $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS)
    3031
    3132testdepend =  osiUnitTest$(EXEEXT)
  • stable/1.14/Clp/test/Makefile.in

    r1753 r1782  
    341341@COIN_HAS_OSITESTS_TRUE@  $(CLPLIB_DEPENDENCIES) $(OSICLP_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
    342342
    343 @COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \
     343@COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = \
    344344@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src` \
    345 @COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`
     345@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` \
     346@COIN_HAS_OSITESTS_TRUE@        $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS)
    346347
    347348@COIN_HAS_OSITESTS_TRUE@testdepend = osiUnitTest$(EXEEXT)
Note: See TracChangeset for help on using the changeset viewer.